update CMakeLists.txt for Windows build environment (ros-perception#265)

* windows bringup * Correct binary locations for shared libraries. * fix build break. * fix cv_bridge_boost.pyd. * remove hard-coded STATIC (ros-perception#3) * remove WINDOWS_EXPORT_ALL_SYMBOLS property (ros-perception#4) * add comment Co-authored-by: shschaefer <[email protected]> Co-authored-by: Sean Yen <[email protected]>
nyxrobotics · Mar 28, 2020 · 578af4d · 578af4d
1 parent ace8c78
commit 578af4d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cv_bridge/src/CMakeLists.txt b/cv_bridge/src/CMakeLists.txt
@@ -45,12 +45,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()
diff --git 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_PACKAGE_BIN_DESTINATION}
         ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+        RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
 )
 
 # add tests