rename TARGETS variable (#368)

ros · Feb 26, 2013 · 9b2e409 · 9b2e409
1 parent 13f7778
commit 9b2e409
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/cmake/catkinConfig.cmake.in b/cmake/catkinConfig.cmake.in
@@ -47,7 +47,7 @@ if(NOT _CATKIN_FIND_ OR _CATKIN_FIND_ EQUAL 0)
   set(catkin_INCLUDE_DIRS "")
   set(catkin_LIBRARIES "")
   set(catkin_LIBRARY_DIRS "")
-  set(catkin_CODE_GENERATION_TARGETS "")
+  set(catkin_EXPORTED_TARGETS "")
 endif()
 
 # increment recursion counter
@@ -83,7 +83,7 @@ foreach(component ${catkin_FIND_COMPONENTS})
     list_append_unique(catkin_INCLUDE_DIRS ${${component}_INCLUDE_DIRS})
     list_append_unique(catkin_LIBRARIES ${${component}_LIBRARIES})
     list_append_unique(catkin_LIBRARY_DIRS ${${component}_LIBRARY_DIRS})
-    list(APPEND catkin_CODE_GENERATION_TARGETS ${${component}_CODE_GENERATION_TARGETS})
+    list(APPEND catkin_EXPORTED_TARGETS ${${component}_EXPORTED_TARGETS})
   endif()
 endforeach()
 list_insert_in_workspace_order(catkin_INCLUDE_DIRS ${catkin_INCLUDE_DIRS})

diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
@@ -49,13 +49,13 @@
 #   If the global variable ${PROJECT_NAME}_CFG_EXTRAS is set it will be
 #   prepended to the explicitly passed argument.
 # :type CFG_EXTRAS: string
-# :param CODE_GENERATION_TARGETS: a list of target names which generate
+# :param EXPORTED_TARGETS: a list of target names which usually generate
 #   code. Downstream packages can depend on these targets to ensure that
 #   code is generated before it is being used. The generated CMake config
 #   file will ensure that the targets exists.
-#   If the global variable ${PROJECT_NAME}_CODE_GENERATION_TARGETS is
+#   If the global variable ${PROJECT_NAME}_EXPORTED_TARGETS is
 #   set it will be prepended to the explicitly passed argument.
-# :type CODE_GENERATION_TARGETS: string
+# :type EXPORTED_TARGETS: string
 # :param SKIP_CMAKE_CONFIG_GENERATION: the option to skip the generation
 #   of the CMake config files for the package
 # :type SKIP_CMAKE_CONFIG_GENERATION: bool
@@ -348,8 +348,8 @@ function(_catkin_package)
   endforeach()
 
   if(NOT PROJECT_SKIP_CMAKE_CONFIG_GENERATION)
-    set(PKG_CODE_GENERATION_TARGETS ${${PROJECT_NAME}_CODE_GENERATION_TARGETS} ${PROJECT_CODE_GENERATION_TARGETS})
-    foreach(t ${PKG_CODE_GENERATION_TARGETS})
+    set(PKG_EXPORTED_TARGETS ${${PROJECT_NAME}_EXPORTED_TARGETS} ${PROJECT_EXPORTED_TARGETS})
+    foreach(t ${PKG_EXPORTED_TARGETS})
       if(NOT TARGET ${t})
         message(FATAL_ERROR "catkin_package() could not find target '${t}' for code generation.")
       endif()

diff --git a/cmake/templates/pkgConfig.cmake.in b/cmake/templates/pkgConfig.cmake.in
@@ -130,9 +130,9 @@ foreach(library ${libraries})
   endif()
 endforeach()
 
-set(@PROJECT_NAME@_CODE_GENERATION_TARGETS "@PKG_CODE_GENERATION_TARGETS@")
+set(@PROJECT_NAME@_EXPORTED_TARGETS "@PKG_EXPORTED_TARGETS@")
 # create dummy targets for exported code generation targets to make life of users easier
-foreach(t ${@PROJECT_NAME@_CODE_GENERATION_TARGETS})
+foreach(t ${@PROJECT_NAME@_EXPORTED_TARGETS})
   if(NOT TARGET ${t})
     add_custom_target(${t})
   endif()
@@ -157,7 +157,7 @@ foreach(depend ${depends})
   _list_append_unique(@PROJECT_NAME@_INCLUDE_DIRS ${${@PROJECT_NAME@_dep}_INCLUDE_DIRS})
   list(APPEND @PROJECT_NAME@_LIBRARIES ${${@PROJECT_NAME@_dep}_LIBRARIES})
   _list_append_unique(@PROJECT_NAME@_LIBRARY_DIRS ${${@PROJECT_NAME@_dep}_LIBRARY_DIRS})
-  list(APPEND @PROJECT_NAME@_CODE_GENERATION_TARGETS ${${@PROJECT_NAME@_dep}_CODE_GENERATION_TARGETS})
+  list(APPEND @PROJECT_NAME@_EXPORTED_TARGETS ${${@PROJECT_NAME@_dep}_EXPORTED_TARGETS})
 endforeach()
 
 if(@PROJECT_NAME@_LIBRARIES)

diff --git a/test/mock_resources/src/catkin_test/quux_user/CMakeLists.txt b/test/mock_resources/src/catkin_test/quux_user/CMakeLists.txt
@@ -32,7 +32,7 @@ include_directories(${sensor_msgs_INCLUDE_DIRS})
 include_directories(${std_msgs_INCLUDE_DIRS} ${quux_msgs_INCLUDE_DIRS})
 
 add_executable(quux_user-exec src/main.cpp)
-add_dependencies(quux_user-exec sensor_msgs_gencpp)
+add_dependencies(quux_user-exec ${sensor_msgs_EXPORTED_TARGETS})
 
 message(STATUS ${roscpp_serialization_LIBRARIES})
 
@@ -41,4 +41,4 @@ target_link_libraries(quux_user-exec ${roscpp_serialization_LIBRARIES} ${rostime
 add_executable(quux_srv-exec src/srv_test.cpp)
 
 target_link_libraries(quux_srv-exec ${roscpp_serialization_LIBRARIES})
-add_dependencies(quux_srv-exec sensor_msgs_gencpp)
+add_dependencies(quux_srv-exec ${sensor_msgs_EXPORTED_TARGETS})