[rtm-ros-robotics] r6963 committed - build hrpsys-base-source when compiling time rather than configuration...

[rtm-ros-...@googlecode.com]

Revision: 6963
Author: gara...@gmail.com
Date: Fri Feb 7 18:12:14 2014 UTC
Log: build hrpsys-base-source when compiling time rather than
configuration time
http://code.google.com/p/rtm-ros-robotics/source/detail?r=6963

Modified:
/trunk/rtmros_gazebo/hrpsys_gazebo_general/catkin.cmake

=======================================
--- /trunk/rtmros_gazebo/hrpsys_gazebo_general/catkin.cmake Fri Feb 7
14:06:07 2014 UTC
+++ /trunk/rtmros_gazebo/hrpsys_gazebo_general/catkin.cmake Fri Feb 7
18:12:14 2014 UTC
@@ -7,12 +7,18 @@
find_package(PkgConfig)
pkg_check_modules(openrtm_aist openrtm-aist REQUIRED)
catkin_package(CATKIN_DEPENDS hrpsys_ros_bridge hrpsys_gazebo_msgs)
+
## Build hrpsys for gazebo
-execute_process(COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} make -f
${PROJECT_SOURCE_DIR}/Makefile.hrpsys-base
INSTALL_PREFIX_PATH=${CATKIN_DEVEL_PREFIX}/share/hrpsys_gazebo_general
OPENRTM_DIR=${openrtm_aist_PREFIX}/lib/openrtm_aist
HRPSYS_BASE_SOURCE=${hrpsys_SOURCE_DIR}/build/hrpsys-base-source
CATKIN_INCLUDE_DIRS=${hrpsys_gazebo_msgs_INCLUDE_DIRS} installed
- RESULT_VARIABLE _make_failed)
-if (_make_failed)
- message(FATAL_ERROR "Build of hrpsys/iob failed")
-endif(_make_failed)
+add_custom_command(OUTPUT
${CATKIN_DEVEL_PREFIX}/share/hrpsys_gazebo_general/lib
+ COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} make -f
${PROJECT_SOURCE_DIR}/Makefile.hrpsys-base
INSTALL_PREFIX_PATH=${CATKIN_DEVEL_PREFIX}/share/hrpsys_gazebo_general
OPENRTM_DIR=${openrtm_aist_PREFIX}/lib/openrtm_aist
HRPSYS_BASE_SOURCE=${hrpsys_SOURCE_DIR}/build/hrpsys-base-source
CATKIN_INCLUDE_DIRS=${hrpsys_gazebo_msgs_INCLUDE_DIRS}
CMAKE_PKG_CONFIG_PATH=${CATKIN_DEVEL_PREFIX}/lib/pkgconfig installed
+ DEPENDS)
+add_custom_target(hrpsys_gazebo_general_iob ALL
+ DEPENDS ${CATKIN_DEVEL_PREFIX}/share/hrpsys_gazebo_general/lib)
+#execute_process(COMMAND cmake -E chdir ${PROJECT_SOURCE_DIR} make -f
${PROJECT_SOURCE_DIR}/Makefile.hrpsys-base
INSTALL_PREFIX_PATH=${CATKIN_DEVEL_PREFIX}/share/hrpsys_gazebo_general
OPENRTM_DIR=${openrtm_aist_PREFIX}/lib/openrtm_aist
HRPSYS_BASE_SOURCE=${hrpsys_SOURCE_DIR}/build/hrpsys-base-source
CATKIN_INCLUDE_DIRS=${hrpsys_gazebo_msgs_INCLUDE_DIRS} installed
+# RESULT_VARIABLE _make_failed)
+#if (_make_failed)
+# message(FATAL_ERROR "Build of hrpsys/iob failed")
+#endif(_make_failed)

## Gazebo plugins
include (FindPkgConfig)