blob: 96d382dd341fd299fdc4bfad1be69bb04b762077 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- octomap/src/CMakeLists.txt.orig 2017-04-28 19:49:53 UTC
+++ octomap/src/CMakeLists.txt
@@ -16,8 +16,8 @@ set_target_properties( octomap PROPERTIE
VERSION ${OCTOMAP_VERSION}
SOVERSION ${OCTOMAP_SOVERSION}
)
-ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS})
-SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap")
+#ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS})
+#SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap")
TARGET_LINK_LIBRARIES(octomap octomath)
@@ -25,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI
file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
endif()
-export(TARGETS octomap octomap-static
+export(TARGETS octomap
APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
ADD_SUBDIRECTORY( testing )
@@ -66,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_examp
ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp)
TARGET_LINK_LIBRARIES(octree2pointcloud octomap)
-install(TARGETS octomap octomap-static
+install(TARGETS octomap
EXPORT octomap-targets
INCLUDES DESTINATION include
${INSTALL_TARGETS_DEFAULT_ARGS}
|
