determine the location of the stage library using a generator expression

also makes it relocatable in the process

fix stage cmake config and make it relocatable

fix stage config file (even for saucy)

Author: wjwwood

CMakeLists.txt

@@ -137,11 +137,6 @@ ENDFOREACH(INC ${PC_INCLUDE_DIRS})
 CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/stage.pc.in ${CMAKE_CURRENT_BINARY_DIR}/stage.pc @ONLY)
 INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/stage.pc DESTINATION ${PROJECT_LIB_DIR}/pkgconfig/)
 
-# Create the CMake module files
-CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/stage-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/stage-config.cmake @ONLY)
-CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/stage-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/stage-config-version.cmake @ONLY)
-INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/stage-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/stage-config-version.cmake DESTINATION ${PROJECT_LIB_DIR}/cmake/${PROJECT_NAME})
-
 # Install catkin package.xml
 install(FILES package.xml DESTINATION share/stage)
 
@@ -182,6 +177,25 @@ IF ( BUILD_PLAYER_PLUGIN )
   ENDIF ( PLAYER_FOUND )
 ENDIF ( BUILD_PLAYER_PLUGIN )
 
+# Create the CMake module files (needs to be run after the stage target was created)
+if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} GREATER 2.8.11)
+  # Use a generator expression if the version of cmake allows it.
+  set(STAGE_TARGET_NAME "$<TARGET_FILE_NAME:stage>")
+else()
+  # Otherwise use the LOCATION property of the target (this will produce a warning on newer versions of cmake)
+  get_property(location_ TARGET stage PROPERTY LOCATION)
+  get_filename_component(STAGE_TARGET_NAME "${location_}" NAME)
+  unset(location_)
+endif()
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/stage-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/stage-config.cmake @ONLY)
+if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} GREATER 2.8.11)
+  # Also run it through file(GENERATE ...) to expand generator expressions (if the version of cmake supports it).
+  FILE (GENERATE
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stage-config.cmake
+    INPUT ${CMAKE_CURRENT_BINARY_DIR}/stage-config.cmake)
+endif()
+CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/stage-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/stage-config-version.cmake @ONLY)
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/stage-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/stage-config-version.cmake DESTINATION ${PROJECT_LIB_DIR}/cmake/${PROJECT_NAME})
 
 # generate a cpack config file used to create packaged tarballs
 IF ( CPACK_CFG )

stage-config.cmake.in

@@ -8,7 +8,7 @@ set(STAGE_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME@-@APIVERSIO
   "@OPENGL_INCLUDE_DIR@")
 list(REMOVE_DUPLICATES STAGE_INCLUDE_DIRS)
 set(STAGE_LIBRARIES
-  "@CMAKE_INSTALL_PREFIX@/@PROJECT_LIB_DIR@/libstage.so"
+  "${stage_DIR}/../../../@PROJECT_LIB_DIR@/@STAGE_TARGET_NAME@"
   "@FLTK_LIBRARIES@"
   "@OPENGL_gl_LIBRARIES@")