Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for jsk-ros-pkg/jsk_common/pull/1586 #2311

Merged
merged 5 commits into from
Aug 3, 2018
Merged

fix for jsk-ros-pkg/jsk_common/pull/1586 #2311

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66bd61f
imagesift: fix for jsk-ros-pkg/jsk_common/pull/1586
furushchev Aug 1, 2018
b1c09b4
resized_image_transport: fix for jsk-ros-pkg/jsk_common/pull/1586
furushchev Aug 1, 2018
ff80e5d
add version_gte for jsk_topic_tools
furushchev Aug 1, 2018
949bfe4
to avoid add_custom_target cannot create target install_sample_data b…
k-okada Aug 2, 2018
e89089a
use lib_ instaed of for add_library to avoid conflict
k-okada Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions imagesift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ jsk_feature("BRISK" "BRISK" "imagebrisk")

jsk_nodelet(src/imagesift.cpp
"imagesift/ImageSift"
"imagesift_exec"
"imagesift"
nodelet_sources nodelet_executables)
set_target_properties("imagesift_exec" PROPERTIES OUTPUT_NAME "imagesift")
list(APPEND jsk_exec "imagesift_exec")

add_library(${PROJECT_NAME} SHARED ${nodelet_sources})

Expand Down
2 changes: 1 addition & 1 deletion resized_image_transport/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ add_dependencies(resized_image_transport ${PROJECT_NAME}_gencfg)


# Mark executables and/or libraries for installation
install(TARGETS image_resizer resized_image_transport ${nodelet_executables}
install(TARGETS ${nodelet_executables}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
Expand Down