set CMAKE_BUILD_TYPE to install, also support RelWithDebInfo for deb …

…release
mmurooka · Oct 12, 2014 · 1326030 · 1326030
1 parent 6061434
commit 1326030
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/hrpsys_gazebo_general/catkin.cmake b/hrpsys_gazebo_general/catkin.cmake
@@ -10,6 +10,14 @@ pkg_check_modules(openhrp3 openhrp3.1 REQUIRED)
 pkg_check_modules(collada_urdf_jsk_patch collada_urdf_jsk_patch)
 catkin_package(CATKIN_DEPENDS hrpsys_ros_bridge hrpsys_gazebo_msgs)
 
+# set CMAKE_BUILD_TYPE
+if(NOT CMAKE_BUILD_TYPE)
+  set(
+    CMAKE_BUILD_TYPE Release CACHE STRING
+    "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+    FORCE)
+endif()
+
 ## Build only gazebo iob
 find_package(PkgConfig)
 pkg_check_modules(omniorb omniORB4 REQUIRED)
@@ -73,3 +81,4 @@ add_custom_target(all_robots_compile ALL DEPENDS ${compile_urdf_robots})
 ## install
 install(DIRECTORY launch scripts worlds config DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS)
 install(PROGRAMS setup.sh DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+
diff --git a/hrpsys_gazebo_general/iob/CMakeLists.txt b/hrpsys_gazebo_general/iob/CMakeLists.txt
@@ -33,9 +33,12 @@ set_target_properties(hrpEC_gazebo PROPERTIES OUTPUT_NAME hrpEC)
 set_target_properties(hrpEC_gazebo PROPERTIES COMPILE_DEFINITIONS "OPENRTM_VERSION110")
 
 
-install(TARGETS RobotHardwareComp_gazebo RobotHardware_gazebo hrpEC_gazebo hrpIo_gazebo
-  RUNTIME DESTINATION bin CONFIGURATIONS Release Debug
-  LIBRARY DESTINATION lib CONFIGURATIONS Release Debug
+install(TARGETS hrpIo_gazebo
+  LIBRARY DESTINATION lib CONFIGURATIONS Release Debug RelWithDebInfo
+)
+install(TARGETS RobotHardwareComp_gazebo RobotHardware_gazebo hrpEC_gazebo
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} CONFIGURATIONS Release Debug RelWithDebInfo
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/lib CONFIGURATIONS Release Debug RelWithDebInfo
 )