From e8b87926911d99b41620d88f9f61ed540cc488ef Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 16 Jun 2017 15:52:59 +0800 Subject: flann: Add compilation of dll and flann_cpp. --- ports/flann/CONTROL | 2 +- ports/flann/fix-install-flann.patch | 41 ------------------------------------- ports/flann/portfile.cmake | 39 ++++++++++------------------------- 3 files changed, 12 insertions(+), 70 deletions(-) delete mode 100644 ports/flann/fix-install-flann.patch diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL index a4a5c4ddc..5cedc1833 100644 --- a/ports/flann/CONTROL +++ b/ports/flann/CONTROL @@ -1,3 +1,3 @@ Source: flann Version: 1.9.1 -Description: performing fast approximate nearest neighbor searches in high dimensional spaces +Description: Fast Library for Approximate Nearest Neighbors diff --git a/ports/flann/fix-install-flann.patch b/ports/flann/fix-install-flann.patch deleted file mode 100644 index f65094e8f..000000000 --- a/ports/flann/fix-install-flann.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git "a/src/cpp/CMakeLists.txt" "b/src/cpp/CMakeLists.txt" -index 49c53f0..cc58c90 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 SHARED ${C_SOURCES}) -+ add_library(flann ${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 flann_s -+ TARGETS flann - RUNTIME DESTINATION bin - LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 4a87365c0..cf4e6fc49 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -11,41 +11,24 @@ # include(vcpkg_common_functions) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mariusmuja/flann - REF 1.9.1 - SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install-flann.patch" +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flann-1.9.1) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/mariusmuja/flann/archive/1.9.1.zip" + FILENAME "flann-1.9.1.zip" + SHA512 d2f5c13535a179800602dc8a94ee91da23b01f71bc893facdf91ab18a73c5738604cda9870f38c3797af75ded47c808b1d95d3bde707af814e1eb1388b56bb95 ) +vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - #PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS - -DBUILD_EXAMPLES=OFF - -DBUILD_PYTHON_BINDINGS=OFF - -DBUILD_MATLAB_BINDINGS=OFF - -DBUILD_DOC=OFF - - OPTIONS_RELEASE - -DFLANN_LIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib - - OPTIONS_DEBUG - -DFLANN_LIB_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/debug/lib - + PREFER_NINJA # Disable this option if project cannot be built with Ninja + OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF ) vcpkg_install_cmake() -#clean file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - + # Handle copyright -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/flann/README.md ${CURRENT_PACKAGES_DIR}/share/flann/copyright) \ No newline at end of file +file(COPY ${CURRENT_BUILDTREES_DIR}/src/flann-1.9.1/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/flann/COPYING ${CURRENT_PACKAGES_DIR}/share/flann/copyright) -- cgit v1.2.3 From c626675abb963d15f5d290a56005556d95b160bd Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 16 Jun 2017 17:16:10 +0800 Subject: Remove dll for static build. --- ports/flann/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index cf4e6fc49..46d8d70ab 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -29,6 +29,10 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + # Handle copyright file(COPY ${CURRENT_BUILDTREES_DIR}/src/flann-1.9.1/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann) file(RENAME ${CURRENT_PACKAGES_DIR}/share/flann/COPYING ${CURRENT_PACKAGES_DIR}/share/flann/copyright) -- cgit v1.2.3 From 45cc143b2628b70e33f19676a7ca14ff681e5e97 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 16 Jun 2017 22:23:37 +0800 Subject: Add WINDOWS_EXPORT_ALL_SYMBOLS property to flann_cpp only. --- ports/flann/CONTROL | 2 +- ports/flann/export-all-symbols-of-flann-cpp.patch | 12 ++++++++++++ ports/flann/portfile.cmake | 11 ++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/flann/export-all-symbols-of-flann-cpp.patch diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL index 5cedc1833..f8d71978d 100644 --- a/ports/flann/CONTROL +++ b/ports/flann/CONTROL @@ -1,3 +1,3 @@ Source: flann -Version: 1.9.1 +Version: 1.9.1-1 Description: Fast Library for Approximate Nearest Neighbors diff --git a/ports/flann/export-all-symbols-of-flann-cpp.patch b/ports/flann/export-all-symbols-of-flann-cpp.patch new file mode 100644 index 000000000..86f172ff3 --- /dev/null +++ b/ports/flann/export-all-symbols-of-flann-cpp.patch @@ -0,0 +1,12 @@ +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index 49c53f0..b9cf76b 100644 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -52,6 +52,7 @@ set_target_properties(flann_cpp PROPERTIES + VERSION ${FLANN_VERSION} + SOVERSION ${FLANN_SOVERSION} + DEFINE_SYMBOL FLANN_EXPORTS ++ WINDOWS_EXPORT_ALL_SYMBOLS ON + ) + + if (BUILD_CUDA_LIB) diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 46d8d70ab..b9b518591 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -19,10 +19,19 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/export-all-symbols-of-flann-cpp.patch" +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_DOC=OFF + -DBUILD_PYTHON_BINDINGS=OFF + -DBUILD_MATLAB_BINDINGS=OFF ) vcpkg_install_cmake() -- cgit v1.2.3 From 8f013f811f644b439c2d47510c002f3cc5576c43 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 16 Jun 2017 22:34:40 +0800 Subject: Remove import libraries in static build. --- ports/flann/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index b9b518591..667374b7d 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -40,6 +40,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp.lib) endif() # Handle copyright -- cgit v1.2.3 From 47909aff3ed07f28ab0ccb23ec69a8908048fc7a Mon Sep 17 00:00:00 2001 From: Sean Li Date: Sat, 17 Jun 2017 11:05:52 +0800 Subject: Substitue vcpkg_from_github for vcpkg_download_distfile. --- ports/flann/portfile.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 667374b7d..bbc47eb05 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -11,13 +11,13 @@ # include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/flann-1.9.1) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mariusmuja/flann/archive/1.9.1.zip" - FILENAME "flann-1.9.1.zip" - SHA512 d2f5c13535a179800602dc8a94ee91da23b01f71bc893facdf91ab18a73c5738604cda9870f38c3797af75ded47c808b1d95d3bde707af814e1eb1388b56bb95 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mariusmuja/flann + REF 1.9.1 + SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 ) -vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} @@ -45,5 +45,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() # Handle copyright -file(COPY ${CURRENT_BUILDTREES_DIR}/src/flann-1.9.1/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann) +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann) file(RENAME ${CURRENT_PACKAGES_DIR}/share/flann/COPYING ${CURRENT_PACKAGES_DIR}/share/flann/copyright) -- cgit v1.2.3 From 5c5affcc2928a611ccbefc1fe37d6bc66720a33c Mon Sep 17 00:00:00 2001 From: Sean Li Date: Sat, 17 Jun 2017 12:09:44 +0800 Subject: Revert previous patch rather than deleting it. --- ports/flann/Revert-fix-install-flann.patch | 41 ++++++++++++++++++++++++++++++ ports/flann/fix-install-flann.patch | 41 ++++++++++++++++++++++++++++++ ports/flann/portfile.cmake | 5 +++- 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 ports/flann/Revert-fix-install-flann.patch create mode 100644 ports/flann/fix-install-flann.patch diff --git a/ports/flann/Revert-fix-install-flann.patch b/ports/flann/Revert-fix-install-flann.patch new file mode 100644 index 000000000..ace1b592a --- /dev/null +++ b/ports/flann/Revert-fix-install-flann.patch @@ -0,0 +1,41 @@ +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} diff --git a/ports/flann/fix-install-flann.patch b/ports/flann/fix-install-flann.patch new file mode 100644 index 000000000..f65094e8f --- /dev/null +++ b/ports/flann/fix-install-flann.patch @@ -0,0 +1,41 @@ +diff --git "a/src/cpp/CMakeLists.txt" "b/src/cpp/CMakeLists.txt" +index 49c53f0..cc58c90 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 SHARED ${C_SOURCES}) ++ add_library(flann ${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 flann_s ++ TARGETS flann + RUNTIME DESTINATION bin + LIBRARY DESTINATION ${FLANN_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${FLANN_LIB_INSTALL_DIR} diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index bbc47eb05..03367f9ca 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -21,7 +21,10 @@ vcpkg_from_github( vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/export-all-symbols-of-flann-cpp.patch" + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/fix-install-flann.patch + ${CMAKE_CURRENT_LIST_DIR}/Revert-fix-install-flann.patch + ${CMAKE_CURRENT_LIST_DIR}/export-all-symbols-of-flann-cpp.patch ) vcpkg_configure_cmake( -- cgit v1.2.3 From 89b9b8ed34fd2da493665d2515ff418efb378b9a Mon Sep 17 00:00:00 2001 From: Sean Li Date: Sat, 17 Jun 2017 12:14:29 +0800 Subject: Remove static lib for dynamic build. --- ports/flann/portfile.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 03367f9ca..52be7aa24 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -45,6 +45,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann.lib) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp.lib) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_s.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp_s.lib) endif() # Handle copyright -- cgit v1.2.3 From 525d30d256f67a86ed6497b80c659106fcb84521 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 16 Jun 2017 21:43:00 -0700 Subject: [flann] Add HEAD_REF, rename static libs to appear dynamic --- ports/flann/CONTROL | 2 +- ports/flann/portfile.cmake | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL index f8d71978d..41a18ae62 100644 --- a/ports/flann/CONTROL +++ b/ports/flann/CONTROL @@ -1,3 +1,3 @@ Source: flann -Version: 1.9.1-1 +Version: 1.9.1-2 Description: Fast Library for Approximate Nearest Neighbors diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 52be7aa24..96f2af0e3 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -1,15 +1,3 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - include(vcpkg_common_functions) vcpkg_from_github( @@ -17,6 +5,7 @@ vcpkg_from_github( REPO mariusmuja/flann REF 1.9.1 SHA512 0da78bb14111013318160dd3dee1f93eb6ed077b18439fd6496017b62a8a6070cc859cfb3e08dad4c614e48d9dc1da5f7c4a21726ee45896d360506da074a6f7 + HEAD_REF master ) vcpkg_apply_patches( @@ -29,7 +18,7 @@ vcpkg_apply_patches( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF @@ -45,6 +34,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann.lib) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp.lib) + # Rename static libs to appear dynamic + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/lib/flann.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/lib/flann_cpp.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp.lib) elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_s.lib) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp_s.lib) -- cgit v1.2.3