mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 00:37:49 +08:00
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
|
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
|
||
|
|
index cc58c90..49c53f0 100644
|
||
|
|
--- a/src/cpp/CMakeLists.txt
|
||
|
|
+++ b/src/cpp/CMakeLists.txt
|
||
|
|
@@ -87,7 +87,7 @@ if (BUILD_C_BINDINGS)
|
||
|
|
set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
|
||
|
|
target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
|
||
|
|
else()
|
||
|
|
- add_library(flann ${C_SOURCES})
|
||
|
|
+ add_library(flann SHARED ${C_SOURCES})
|
||
|
|
|
||
|
|
if(MINGW AND OPENMP_FOUND)
|
||
|
|
target_link_libraries(flann gomp)
|
||
|
|
@@ -111,12 +111,12 @@ endif()
|
||
|
|
endif(WIN32)
|
||
|
|
|
||
|
|
|
||
|
|
-#install (
|
||
|
|
-# TARGETS flann_cpp flann_cpp_s
|
||
|
|
-# RUNTIME DESTINATION bin
|
||
|
|
-# LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
|
||
|
|
-# ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
|
||
|
|
-#)
|
||
|
|
+install (
|
||
|
|
+ TARGETS flann_cpp flann_cpp_s
|
||
|
|
+ RUNTIME DESTINATION bin
|
||
|
|
+ LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
|
||
|
|
+ ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
|
||
|
|
+)
|
||
|
|
|
||
|
|
if (BUILD_CUDA_LIB)
|
||
|
|
install (
|
||
|
|
@@ -129,7 +129,7 @@ endif()
|
||
|
|
|
||
|
|
if (BUILD_C_BINDINGS)
|
||
|
|
install (
|
||
|
|
- TARGETS flann
|
||
|
|
+ TARGETS flann flann_s
|
||
|
|
RUNTIME DESTINATION bin
|
||
|
|
LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR}
|
||
|
|
ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR}
|