diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-14 14:11:53 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-07-14 14:11:53 -0700 |
| commit | 852802770f735e47aadd0a1bb5b9b1b64875874b (patch) | |
| tree | 310379a4382c3ac2c1b2f243e31082391d873c31 | |
| parent | 8059e874a6e00ad596e04657b802380c9cb99475 (diff) | |
| download | vcpkg-852802770f735e47aadd0a1bb5b9b1b64875874b.tar.gz vcpkg-852802770f735e47aadd0a1bb5b9b1b64875874b.zip | |
[flann] Restore rename behavior
| -rw-r--r-- | ports/flann/CONTROL | 2 | ||||
| -rw-r--r-- | ports/flann/portfile.cmake | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL index 117938c82..ad9a5e871 100644 --- a/ports/flann/CONTROL +++ b/ports/flann/CONTROL @@ -1,3 +1,3 @@ Source: flann -Version: 1.9.1-3 +Version: 1.9.1-4 Description: Fast Library for Approximate Nearest Neighbors diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index 6f0165468..ba7eca546 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -35,6 +35,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-gd.lib) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp-gd.lib) + + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/lib/flann-gd.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/flann_s-gd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann-gd.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/lib/flann_cpp-gd.lib) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp_s-gd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp-gd.lib) elseif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_s-gd.lib) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp_s-gd.lib) |