From f7b6d2f964415a42bf33a33695db624bb0c57482 Mon Sep 17 00:00:00 2001 From: James Xu Date: Fri, 1 Feb 2019 16:14:33 -0800 Subject: [PATCH 1/7] windows bringup --- cv_bridge/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt index 37ba30eea..d1a434843 100644 --- a/cv_bridge/src/CMakeLists.txt +++ b/cv_bridge/src/CMakeLists.txt @@ -1,6 +1,6 @@ # add library include_directories(./) -add_library(${PROJECT_NAME} cv_bridge.cpp rgb_colors.cpp) +add_library(${PROJECT_NAME} STATIC cv_bridge.cpp rgb_colors.cpp) add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS}) target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES}) From 3211270a37afc702b6d055b3462e817d7392f53e Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Tue, 21 Aug 2018 13:51:35 -0700 Subject: [PATCH 2/7] fix build break. --- cv_bridge/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt index d1a434843..d71061870 100644 --- a/cv_bridge/src/CMakeLists.txt +++ b/cv_bridge/src/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories(./) add_library(${PROJECT_NAME} STATIC cv_bridge.cpp rgb_colors.cpp) add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS}) target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES}) +set_target_properties(${PROJECT_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) install(TARGETS ${PROJECT_NAME} DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) From 3bc3cd1c8d3257ac02c2d6e6acedf59ef55e196d Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Fri, 24 Aug 2018 00:09:57 -0700 Subject: [PATCH 3/7] fix cv_bridge_boost.pyd. --- cv_bridge/src/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt index d71061870..ff2f7fe8d 100644 --- a/cv_bridge/src/CMakeLists.txt +++ b/cv_bridge/src/CMakeLists.txt @@ -46,12 +46,17 @@ target_link_libraries(${PROJECT_NAME}_boost ${Boost_LIBRARIES} set_target_properties(${PROJECT_NAME}_boost PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_PYTHON_DESTINATION}/${PROJECT_NAME}/boost/ + RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_PYTHON_DESTINATION}/${PROJECT_NAME}/boost/ PREFIX "" ) if(APPLE) set_target_properties(${PROJECT_NAME}_boost PROPERTIES SUFFIX ".so") endif() +if(MSVC) + set_target_properties(${PROJECT_NAME}_boost PROPERTIES + SUFFIX ".pyd") +endif() install(TARGETS ${PROJECT_NAME}_boost DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}/boost/) endif() From d89691489f3ebae6d8b2b43f73fb9f018e8635d9 Mon Sep 17 00:00:00 2001 From: James Xu Date: Thu, 31 Jan 2019 21:32:16 -0800 Subject: [PATCH 4/7] remove hard-coded STATIC (#3) --- cv_bridge/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt index ff2f7fe8d..d41105e4b 100644 --- a/cv_bridge/src/CMakeLists.txt +++ b/cv_bridge/src/CMakeLists.txt @@ -1,6 +1,6 @@ # add library include_directories(./) -add_library(${PROJECT_NAME} STATIC cv_bridge.cpp rgb_colors.cpp) +add_library(${PROJECT_NAME} cv_bridge.cpp rgb_colors.cpp) add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS}) target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES}) set_target_properties(${PROJECT_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) From 4547b266705d2769e4c6ec6f9795b9289d1b3910 Mon Sep 17 00:00:00 2001 From: James Xu Date: Fri, 1 Feb 2019 16:01:01 -0800 Subject: [PATCH 5/7] remove WINDOWS_EXPORT_ALL_SYMBOLS property (#4) --- cv_bridge/src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt index d41105e4b..d5d8ee223 100644 --- a/cv_bridge/src/CMakeLists.txt +++ b/cv_bridge/src/CMakeLists.txt @@ -3,7 +3,6 @@ include_directories(./) add_library(${PROJECT_NAME} cv_bridge.cpp rgb_colors.cpp) add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS}) target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBRARIES} ${catkin_LIBRARIES}) -set_target_properties(${PROJECT_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) install(TARGETS ${PROJECT_NAME} DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}) From 221549863b996e25c30cabe3c0a4d0dbe457eb1d Mon Sep 17 00:00:00 2001 From: shschaefer Date: Wed, 8 Aug 2018 12:07:11 -0700 Subject: [PATCH 6/7] Correct binary locations for shared libraries. --- image_geometry/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image_geometry/CMakeLists.txt b/image_geometry/CMakeLists.txt index 9169c0484..970fca84f 100644 --- a/image_geometry/CMakeLists.txt +++ b/image_geometry/CMakeLists.txt @@ -25,7 +25,7 @@ install(DIRECTORY include/${PROJECT_NAME}/ ) install(TARGETS ${PROJECT_NAME} - RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} + RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ) From 04d4135282b10f57ed4fee667ea833d81911b60b Mon Sep 17 00:00:00 2001 From: James Xu Date: Tue, 19 Feb 2019 17:44:22 -0800 Subject: [PATCH 7/7] add comment --- image_geometry/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/image_geometry/CMakeLists.txt b/image_geometry/CMakeLists.txt index 970fca84f..6c2274192 100644 --- a/image_geometry/CMakeLists.txt +++ b/image_geometry/CMakeLists.txt @@ -24,10 +24,11 @@ install(DIRECTORY include/${PROJECT_NAME}/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}/ ) +# install library install(TARGETS ${PROJECT_NAME} - RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} ) # add tests