Fixed package creation (package target), updated RTABMapConfig.cmake

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1051 f169173b-cf89-36c8-b27e-44dbe73f0c83

CMakeLists.txt

@@ -129,15 +129,6 @@ endif()
 set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH
   "Installation directory for CMake files")
   
-######## for RTABMapConfig.cmake #########
-# Make relative paths absolute (needed later on)
-foreach(p LIB BIN INCLUDE CMAKE)
-  set(var INSTALL_${p}_DIR)
-  if(NOT IS_ABSOLUTE "${${var}}")
-    set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
-  endif()
-endforeach()
-
 ####### BUILD OPTIONS #######
 OPTION(BUILD_LIBS_ONLY "Set to ON to build only the libraries" OFF)
 IF(APPLE)
@@ -232,30 +223,28 @@ ADD_CUSTOM_TARGET(uninstall
 ####
 # Setup RTABMapConfig.cmake
 ####
-# Add all targets to the build-tree export set
-IF(BUILD_LIBS_ONLY)
-  export(TARGETS rtabmap_core rtabmap_gui rtabmap_utilite
-         FILE "${PROJECT_BINARY_DIR}/RTABMapTargets.cmake")
-ELSE()
-  export(TARGETS rtabmap rtabmap_core rtabmap_gui rtabmap_utilite
-         FILE "${PROJECT_BINARY_DIR}/RTABMapTargets.cmake")
-ENDIF()
-
 # Export the package for use from the build-tree
 # (this registers the build-tree with a global CMake-registry)
 export(PACKAGE RTABMap)
 
 # Create the RTABMapConfig.cmake and RTABMapConfigVersion files
-file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
+file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}")
-   "${INSTALL_INCLUDE_DIR}")
+file(RELATIVE_PATH REL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}")
+   
 # ... for the build tree
-set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
+set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/corelib/include" 
+					  "${PROJECT_SOURCE_DIR}/guilib/include" 
+					  "${PROJECT_SOURCE_DIR}/utilite/include")
+set(CONF_LIB_DIR "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
 configure_file(RTABMapConfig.cmake.in
   "${PROJECT_BINARY_DIR}/RTABMapConfig.cmake" @ONLY)
+  
 # ... for the install tree
 set(CONF_INCLUDE_DIRS "\${RTABMap_CMAKE_DIR}/${REL_INCLUDE_DIR}")
+set(CONF_LIB_DIR "\${RTABMap_CMAKE_DIR}/${REL_LIB_DIR}")
 configure_file(RTABMapConfig.cmake.in
   "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/RTABMapConfig.cmake" @ONLY)
+  
 # ... for both
 configure_file(RTABMapConfigVersion.cmake.in
   "${PROJECT_BINARY_DIR}/RTABMapConfigVersion.cmake" @ONLY)
@@ -265,10 +254,6 @@ install(FILES
   "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/RTABMapConfig.cmake"
   "${PROJECT_BINARY_DIR}/RTABMapConfigVersion.cmake"
   DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT devel)
-
-# Install the export set for use with the install-tree
-install(EXPORT RTABMapTargets DESTINATION
-  "${INSTALL_CMAKE_DIR}" COMPONENT devel)
 ####
 
 #######################

RTABMapConfig.cmake.in

@@ -2,15 +2,13 @@
 # It defines the following variables
 #  RTABMap_INCLUDE_DIRS - include directories for RTABMap
 #  RTABMap_LIBRARIES    - libraries to link against
-#  RTABMap_EXECUTABLE   - the bar executable
 
 # Compute paths
 get_filename_component(RTABMap_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(RTABMap_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
 
-# Our library dependencies (contains definitions for IMPORTED targets)
-include("${RTABMap_CMAKE_DIR}/RTABMapTargets.cmake")
-
 # These are IMPORTED targets created by RTABMapTargets.cmake
-set(RTABMap_LIBRARIES rtabmap_core rtabmap_gui rtabmap_utilite)
+find_library(CORE_LIB NAMES rtabmap_core NO_DEFAULT_PATH HINTS "@CONF_LIB_DIR@")
-set(RTABMap_EXECUTABLE rtabmap)
+find_library(GUI_LIB NAMES rtabmap_gui NO_DEFAULT_PATH HINTS "@CONF_LIB_DIR@")
+find_library(UTILITE_LIB NAMES rtabmap_utilite NO_DEFAULT_PATH HINTS "@CONF_LIB_DIR@")
+set(RTABMap_LIBRARIES ${CORE_LIB} ${GUI_LIB} ${UTILITE_LIB})

app/src/CMakeLists.txt

@@ -83,7 +83,6 @@ ENDIF()
 # Installation stuff
 #--------------------------- 
 INSTALL(TARGETS rtabmap
-		EXPORT RTABMapTargets
         RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
         BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)
       

corelib/src/CMakeLists.txt

@@ -84,7 +84,6 @@ ADD_LIBRARY(rtabmap_core ${SRC_FILES} ${RESOURCES_HEADERS})
 TARGET_LINK_LIBRARIES(rtabmap_core rtabmap_utilite ${OpenCV_LIBS} ${SQLITE3_LIBRARY} ${PCL_LIBRARIES} ${ZLIB_LIBRARIES})
 
 INSTALL(TARGETS rtabmap_core
-	    EXPORT RTABMapTargets
         RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT devel
         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT devel)

guilib/src/CMakeLists.txt

@@ -97,15 +97,7 @@ ADD_LIBRARY(rtabmap_gui ${SRC_FILES})
 # Linking with Qt libraries
 TARGET_LINK_LIBRARIES(rtabmap_gui rtabmap_core rtabmap_utilite ${LIBRARIES})
 
-SET_TARGET_PROPERTIES(
-rtabmap_gui
-PROPERTIES
- OUTPUT_NAME ${PROJECT_PREFIX}_gui
- INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib
-)
-
 INSTALL(TARGETS rtabmap_gui
-        EXPORT RTABMapTargets
         RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT devel
         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT devel)

utilite/src/CMakeLists.txt

@@ -30,15 +30,7 @@ ELSE()
     TARGET_LINK_LIBRARIES(rtabmap_utilite ${PTHREADS_LIBRARY})
 ENDIF()
 
-SET_TARGET_PROPERTIES(
-rtabmap_utilite 
-PROPERTIES
- OUTPUT_NAME ${PROJECT_PREFIX}_utilite
- INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib
-)
-
 INSTALL(TARGETS rtabmap_utilite
-		EXPORT RTABMapTargets
         RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT devel
         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT devel)