Merge branch 'catkin_isolated_dummy_lib_test' of https://github.com/g…

…avanderhoorn/industrial_core into hydro

industrial_robot_client/CMakeLists.txt

@@ -30,14 +30,19 @@ catkin_package(
       simple_message actionlib_msgs actionlib urdf industrial_msgs
       industrial_utils
     INCLUDE_DIRS include
-)                
+)
 
 
 
 include_directories(include
   ${catkin_INCLUDE_DIRS}
 )
 
+
+# do some trickery with the linker for simple_message
+simple_message_linker_setup()
+
+
 # This library depends on the simple_message library, which is available
 # in two formats to support endian differences between robot & PC.
 #

simple_message/CMakeLists.txt

@@ -69,14 +69,30 @@ set(UTEST_SRC_FILES test/utest.cpp test/utest_message.cpp)
 
 catkin_package(
     CATKIN_DEPENDS roscpp industrial_msgs
-    INCLUDE_DIRS include 
+    INCLUDE_DIRS include
+    LIBRARIES simple_message_dummy
+    CFG_EXTRAS simple_message_linker_setup.cmake
 )
 
 
 include_directories(include
   ${catkin_INCLUDE_DIRS}
 )
 
+
+# generate dummy library (we export it in catkin_package(..)), to force catkin
+# to set up simple_message_LIBRARY_DIRS properly.
+# TODO: find out if LIBRARY_DIRS can be exported without dummy library target
+add_custom_command(
+  OUTPUT  ${CMAKE_CURRENT_BINARY_DIR}/simple_message_dummy.cpp
+  COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/simple_message_dummy.cpp)
+add_library(simple_message_dummy ${CMAKE_CURRENT_BINARY_DIR}/simple_message_dummy.cpp)
+# unfortunately this will have to be installed, but the linker will remove it
+# from the library dependencies of dependent targets, as it contains no symbols
+# that can be imported from it.
+install(TARGETS simple_message_dummy DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
+
+
 # NOTE: All test files require TEST_PORT_BASE to be defined.  Defining different
 # ports for each test executable allows them to run in parallel.
 

simple_message/cmake/simple_message_linker_setup.cmake

@@ -0,0 +1,9 @@
+
+function(simple_message_linker_setup)
+    if (DEFINED simple_message_LIBRARY_DIRS)
+    else()
+        message(FATAL_ERROR "simple_message_LIBRARY_DIRS not set, "
+            "have you find_package()-ed it?")
+    endif()
+    link_directories(${simple_message_LIBRARY_DIRS})
+endfunction()