Merge pull request #140 from jamiesnape/cmake-exported-targets

Add CMake exported targets
OctoMap · Oct 11, 2016 · 6d7c31a · 6d7c31a
2 parents 9046b43 + 21d159f
commit 6d7c31a
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 12 deletions.
diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt
@@ -124,6 +124,9 @@ set(DYNAMICEDT3D_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
 set(DYNAMICEDT3D_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 #set(DYNAMICEDT3D_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
 
+set(DYNAMICEDT3D_INCLUDE_TARGETS
+  "include(\${CMAKE_CURRENT_LIST_DIR}/dynamicEDT3DTargets.cmake)")
+
 CONFIGURE_PACKAGE_CONFIG_FILE(
   dynamicEDT3DConfig.cmake.in
   "${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig.cmake"

diff --git a/dynamicEDT3D/dynamicEDT3DConfig.cmake.in b/dynamicEDT3D/dynamicEDT3DConfig.cmake.in
@@ -28,3 +28,5 @@ set_and_check(DYNAMICEDT3D_INCLUDE_DIRS "@PACKAGE_DYNAMICEDT3D_INCLUDE_DIRS@")
 set_and_check(DYNAMICEDT3D_LIBRARY_DIRS "@PACKAGE_DYNAMICEDT3D_LIB_DIR@")
 
 set(DYNAMICEDT3D_LIBRARIES "@PACKAGE_DYNAMICEDT3D_LIB_DIR@/@DYNAMICEDT3D_LIBRARY@")
+
+@DYNAMICEDT3D_INCLUDE_TARGETS@
diff --git a/dynamicEDT3D/src/CMakeLists.txt b/dynamicEDT3D/src/CMakeLists.txt
@@ -14,6 +14,9 @@ target_link_libraries(dynamicedt3d-static ${OCTOMAP_LIBRARIES})
 
 SET_TARGET_PROPERTIES(dynamicedt3d-static PROPERTIES OUTPUT_NAME "dynamicedt3d") 
 
+export(TARGETS dynamicedt3d dynamicedt3d-static
+  FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/dynamicEDT3D/dynamicEDT3DTargets.cmake")
+
 # directly depend on the octomap library target when building the
 # complete distribution, so it it recompiled as needed
 if (CMAKE_PROJECT_NAME STREQUAL "octomap-distribution")
@@ -23,7 +26,9 @@ endif()
 
 ADD_SUBDIRECTORY(examples)
 
-install(TARGETS 
-  dynamicedt3d
-  dynamicedt3d-static
-  ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS dynamicedt3d dynamicedt3d-static
+  EXPORT dynamicEDT3DTargets
+  INCLUDES DESTINATION include
+  ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+install(EXPORT dynamicEDT3DTargets DESTINATION share/dynamicEDT3D/)
diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt
@@ -126,6 +126,9 @@ set(OCTOMAP_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
 set(OCTOMAP_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 #set(OCTOMAP_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
 
+set(OCTOMAP_INCLUDE_TARGETS
+  "include(\${CMAKE_CURRENT_LIST_DIR}/octomap-targets.cmake)")
+
 CONFIGURE_PACKAGE_CONFIG_FILE(
   octomap-config.cmake.in
   "${PROJECT_BINARY_DIR}/InstallFiles/octomap-config.cmake"

diff --git a/octomap/octomap-config.cmake.in b/octomap/octomap-config.cmake.in
@@ -38,3 +38,5 @@ set(OCTOMAP_LIBRARIES
   "@PACKAGE_OCTOMAP_LIB_DIR@/@OCTOMAP_LIBRARY@"
   "@PACKAGE_OCTOMAP_LIB_DIR@/@OCTOMATH_LIBRARY@"
 )
+
+@OCTOMAP_INCLUDE_TARGETS@
diff --git a/octomap/src/CMakeLists.txt b/octomap/src/CMakeLists.txt
@@ -21,6 +21,9 @@ SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap")
 
 TARGET_LINK_LIBRARIES(octomap octomath)
 
+export(TARGETS octomap octomap-static
+  APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
+
 ADD_SUBDIRECTORY( testing )
 
 ADD_EXECUTABLE(graph2tree graph2tree.cpp)
@@ -59,9 +62,14 @@ TARGET_LINK_LIBRARIES(intersection_example octomap)
 ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp)
 TARGET_LINK_LIBRARIES(octree2pointcloud octomap)
 
-install(TARGETS 
-	octomap
-	octomap-static 
+install(TARGETS octomap octomap-static
+  EXPORT octomap-targets
+  INCLUDES DESTINATION include
+  ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+install(EXPORT octomap-targets DESTINATION share/octomap/)
+
+install(TARGETS
 	graph2tree
 	log2graph
 	binvox2bt

diff --git a/octomap/src/math/CMakeLists.txt b/octomap/src/math/CMakeLists.txt
@@ -17,5 +17,11 @@ SET_TARGET_PROPERTIES( octomath PROPERTIES
 ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS})
 SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath")
 
-install(TARGETS octomath octomath-static ${INSTALL_TARGETS_DEFAULT_ARGS})
-
+export(TARGETS octomath octomath-static
+  APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
+
+install(TARGETS octomath octomath-static
+  EXPORT octomap-targets
+  INCLUDES DESTINATION include
+  ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt
@@ -127,6 +127,9 @@ IF(BUILD_VIEWER)
   set(OCTOVIS_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
   #set(OCTOMAP_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
 
+  set(OCTOVIS_INCLUDE_TARGETS
+    "include(\${CMAKE_CURRENT_LIST_DIR}/octovis-targets.cmake)")
+
   CONFIGURE_PACKAGE_CONFIG_FILE(
     octovis-config.cmake.in
     "${PROJECT_BINARY_DIR}/InstallFiles/octovis-config.cmake"

diff --git a/octovis/CMakeLists_src.txt b/octovis/CMakeLists_src.txt
@@ -113,11 +113,15 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   )
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
-install(TARGETS octovis
-  octovis-static
-  octovis-shared
+export(TARGETS octovis octovis-static octovis-shared
+  FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octovis/octovis-targets.cmake")
+
+install(TARGETS octovis octovis-static octovis-shared
+  EXPORT octovis-targets
+  INCLUDES DESTINATION include
   ${INSTALL_TARGETS_DEFAULT_ARGS}
 )
+install(EXPORT octovis-targets DESTINATION share/octovis/)
 
 file(GLOB octovis_HDRS ${PROJECT_SOURCE_DIR}/include/octovis/*.h)
 # filter generated headers for GUI:

diff --git a/octovis/octovis-config.cmake.in b/octovis/octovis-config.cmake.in
@@ -23,3 +23,5 @@ set(OCTOVIS_LIBRARIES
   "@QT_LIBRARIES@"
   "@PACKAGE_OCTOVIS_LIB_DIR@/@OCTOVIS_LIBRARY@"
 )
+
+@OCTOVIS_INCLUDE_TARGETS@