projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 1e59de90 TL |
1 | diff --git a/octomap/src/CMakeLists.txt b/octomap/src/CMakeLists.txt |
| 2 | index 45b384f..ab1b6b1 100644 | |
| 3 | --- a/octomap/src/CMakeLists.txt | |
| 4 | +++ b/octomap/src/CMakeLists.txt | |
| 5 | @@ -8,17 +8,16 @@ SET (octomap_SRCS | |
| 6 | OcTreeNode.cpp | |
| 7 | OcTreeStamped.cpp | |
| 8 | ColorOcTree.cpp | |
| 9 | - ) | |
| 10 | +) | |
| 11 | + | |
| 12 | ||
| 13 | -# dynamic and static libs, see CMake FAQ: | |
| 14 | -ADD_LIBRARY( octomap SHARED ${octomap_SRCS}) | |
| 15 | -set_target_properties( octomap PROPERTIES | |
| 16 | +ADD_LIBRARY(octomap ${octomap_SRCS}) | |
| 17 | +set_target_properties(octomap PROPERTIES | |
| 18 | VERSION ${OCTOMAP_VERSION} | |
| 19 | SOVERSION ${OCTOMAP_SOVERSION} | |
| 20 | + OUTPUT_NAME "octomap" | |
| 21 | ) | |
| 22 | -ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) | |
| 23 | -SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") | |
| 24 | -add_dependencies(octomap-static octomath-static) | |
| 25 | + | |
| 26 | ||
| 27 | TARGET_LINK_LIBRARIES(octomap octomath) | |
| 28 | ||
| 29 | @@ -26,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") | |
| 30 | file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") | |
| 31 | endif() | |
| 32 | ||
| 33 | -export(TARGETS octomap octomap-static | |
| 34 | +export(TARGETS octomap | |
| 35 | APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") | |
| 36 | ||
| 37 | ADD_SUBDIRECTORY( testing ) | |
| 38 | @@ -67,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_example octomap) | |
| 39 | ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp) | |
| 40 | TARGET_LINK_LIBRARIES(octree2pointcloud octomap) | |
| 41 | ||
| 42 | -install(TARGETS octomap octomap-static | |
| 43 | +install(TARGETS octomap | |
| 44 | EXPORT octomap-targets | |
| 45 | INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | |
| 46 | ${INSTALL_TARGETS_DEFAULT_ARGS} | |
| 47 | diff --git a/octomap/src/math/CMakeLists.txt b/octomap/src/math/CMakeLists.txt | |
| 48 | index 3b47ec4..6a75170 100644 | |
| 49 | --- a/octomap/src/math/CMakeLists.txt | |
| 50 | +++ b/octomap/src/math/CMakeLists.txt | |
| 51 | @@ -5,24 +5,22 @@ SET (octomath_SRCS | |
| 52 | ) | |
| 53 | ||
| 54 | ||
| 55 | -ADD_LIBRARY( octomath SHARED ${octomath_SRCS}) | |
| 56 | +ADD_LIBRARY(octomath ${octomath_SRCS}) | |
| 57 | ||
| 58 | SET_TARGET_PROPERTIES( octomath PROPERTIES | |
| 59 | VERSION ${OCTOMAP_VERSION} | |
| 60 | SOVERSION ${OCTOMAP_SOVERSION} | |
| 61 | ) | |
| 62 | ||
| 63 | -ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS}) | |
| 64 | -SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath") | |
| 65 | ||
| 66 | if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") | |
| 67 | file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") | |
| 68 | endif() | |
| 69 | ||
| 70 | -export(TARGETS octomath octomath-static | |
| 71 | +export(TARGETS octomath | |
| 72 | APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") | |
| 73 | ||
| 74 | -install(TARGETS octomath octomath-static | |
| 75 | +install(TARGETS octomath | |
| 76 | EXPORT octomap-targets | |
| 77 | INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | |
| 78 | ${INSTALL_TARGETS_DEFAULT_ARGS} |