-
-
Notifications
You must be signed in to change notification settings - Fork 74
/
Copy pathros-noetic-octomap.win.patch
82 lines (69 loc) · 2.78 KB
/
ros-noetic-octomap.win.patch
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
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 45b384f..7a47f77 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,14 +11,13 @@ SET (octomap_SRCS
)
# dynamic and static libs, see CMake FAQ:
-ADD_LIBRARY( octomap SHARED ${octomap_SRCS})
-set_target_properties( octomap PROPERTIES
- VERSION ${OCTOMAP_VERSION}
- SOVERSION ${OCTOMAP_SOVERSION}
-)
-ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS})
-SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap")
-add_dependencies(octomap-static octomath-static)
+# ADD_LIBRARY( octomap SHARED ${octomap_SRCS})
+# set_target_properties( octomap PROPERTIES
+# VERSION ${OCTOMAP_VERSION}
+# SOVERSION ${OCTOMAP_SOVERSION}
+# )
+ADD_LIBRARY( octomap STATIC ${octomap_SRCS})
+SET_TARGET_PROPERTIES(octomap PROPERTIES OUTPUT_NAME "octomap")
TARGET_LINK_LIBRARIES(octomap octomath)
@@ -26,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
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 )
@@ -67,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_example octomap)
ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp)
TARGET_LINK_LIBRARIES(octree2pointcloud octomap)
-install(TARGETS octomap octomap-static
+install(TARGETS octomap
EXPORT octomap-targets
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
${INSTALL_TARGETS_DEFAULT_ARGS}
diff --git a/src/math/CMakeLists.txt b/src/math/CMakeLists.txt
index 3b47ec4..e163ba0 100644
--- a/src/math/CMakeLists.txt
+++ b/src/math/CMakeLists.txt
@@ -5,24 +5,24 @@ SET (octomath_SRCS
)
-ADD_LIBRARY( octomath SHARED ${octomath_SRCS})
+# ADD_LIBRARY( octomath SHARED ${octomath_SRCS})
-SET_TARGET_PROPERTIES( octomath PROPERTIES
- VERSION ${OCTOMAP_VERSION}
- SOVERSION ${OCTOMAP_SOVERSION}
-)
+# SET_TARGET_PROPERTIES( octomath PROPERTIES
+# VERSION ${OCTOMAP_VERSION}
+# SOVERSION ${OCTOMAP_SOVERSION}
+# )
-ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS})
-SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath")
+ADD_LIBRARY( octomath STATIC ${octomath_SRCS})
+SET_TARGET_PROPERTIES(octomath PROPERTIES OUTPUT_NAME "octomath")
if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap")
endif()
-export(TARGETS octomath octomath-static
+export(TARGETS octomath
APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake")
-install(TARGETS octomath octomath-static
+install(TARGETS octomath
EXPORT octomap-targets
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
${INSTALL_TARGETS_DEFAULT_ARGS}