blob: f3014c57115411dec3e72c71a1edcde07d7e322d (
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
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- octovis/CMakeLists_src.txt.orig 2022-05-12 20:49:09 UTC
+++ octovis/CMakeLists_src.txt
@@ -99,14 +99,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAK
# Library target
-add_library(octovis-static STATIC ${viewerlib_SRCS})
-target_link_libraries(octovis-static
- ${OPENGL_gl_LIBRARY}
- ${OPENGL_glu_LIBRARY}
- ${OCTOMAP_LIBRARIES}
- ${QGLViewer_LIBRARIES}
-)
-set_target_properties(octovis-static PROPERTIES OUTPUT_NAME octovis)
+#add_library(octovis-static STATIC ${viewerlib_SRCS})
+#target_link_libraries(octovis-static
+# ${OPENGL_gl_LIBRARY}
+# ${OPENGL_glu_LIBRARY}
+# ${OCTOMAP_LIBRARIES}
+# ${QGLViewer_LIBRARIES}
+#)
+#set_target_properties(octovis-static PROPERTIES OUTPUT_NAME octovis)
add_library(octovis-shared SHARED ${viewerlib_SRCS})
target_link_libraries(octovis-shared
@@ -124,7 +124,7 @@ set_target_properties(octovis-shared PROPERTIES
# directly depend on the octomap library target when building the
# complete distribution, so it is recompiled as needed
if (CMAKE_PROJECT_NAME STREQUAL "octomap-distribution")
- ADD_DEPENDENCIES(octovis-static octomap-static)
+ #ADD_DEPENDENCIES(octovis-static octomap-static)
ADD_DEPENDENCIES(octovis-shared octomap)
endif()
@@ -151,10 +151,10 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake
file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octovis")
endif()
-export(TARGETS octovis octovis-static octovis-shared
+export(TARGETS octovis octovis-shared
FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octovis/octovis-targets.cmake")
-install(TARGETS octovis octovis-static octovis-shared
+install(TARGETS octovis octovis-shared
EXPORT octovis-targets
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
${INSTALL_TARGETS_DEFAULT_ARGS}
|
