refactored cmake extra stuff

--HG--
rename : cmake/extras.cmake.in => cmake/extras.cmake.em

Author: dirk-thomas

.hgignore

@@ -0,0 +1 @@
+.pyc

CMakeLists.txt

@@ -40,14 +40,6 @@ install(DIRECTORY include/dynamic_reconfigure/
 install(TARGETS dynamic_reconfigure_config_init_mutex
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
 
-# deal with the CMake folder
-file(COPY cmake/rosbuild2.cmake
-     DESTINATION ${CATKIN_BUILD_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/cmake/
-)
-file(COPY templates
-     DESTINATION ${CATKIN_BUILD_PREFIX}/${CATKIN_PACKAGE_SHARE_DESTINATION}/
-)
-      
 install(DIRECTORY cmake
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/
   USE_SOURCE_PERMISSIONS

cmake/rosbuild2.cmake renamed to cmake/extras.cmake.em

@@ -1,18 +1,23 @@
-get_filename_component(dynamic_reconfigure_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+@[if BUILDSPACE]@
+# base dir in buildspace
+set(dynamic_reconfigure_BASE_DIR @(CMAKE_CURRENT_SOURCE_DIR))
+@[else]@
+# base dir in installspace
+set(dynamic_reconfigure_BASE_DIR @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION))
+@[end if]@
 
 macro(generate_dynamic_reconfigure_options)
   set(_autogen "")
   foreach(_cfg ${ARGN})
-
-    # Construct the path to the .cfg file
-    set(_input ${PROJECT_SOURCE_DIR}/${_cfg})
-
-    execute_process(COMMAND ${CATKIN_ENV}
-                            ${_input}
-                            ${dynamic_reconfigure_SELF_DIR}/..
-                            ${CATKIN_BUILD_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION}
-                            ${CATKIN_BUILD_PREFIX}/${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-                            ${CATKIN_BUILD_PREFIX}/${CATKIN_PACKAGE_PYTHON_DESTINATION}
+    set(_cmd ${CATKIN_ENV}
+      ${PROJECT_SOURCE_DIR}/${_cfg}
+      ${dynamic_reconfigure_BASE_DIR}
+      ${CATKIN_BUILD_PREFIX}/${CATKIN_PACKAGE_BIN_DESTINATION}
+      ${CATKIN_BUILD_PREFIX}/${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+      ${CATKIN_BUILD_PREFIX}/${CATKIN_PACKAGE_PYTHON_DESTINATION}
+    )
+    message("dynconf cmd: ${_cmd}")
+    execute_process(COMMAND ${_cmd}
                     RESULT_VARIABLE RES_VAR
                     OUTPUT_VARIABLE OUT_VAR
                     ERROR_VARIABLE ERR_VAR