diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-07-14 14:12:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 14:12:44 -0700 |
| commit | f8e13e7b8c1249c794ce3d06d7fe00b1a1304869 (patch) | |
| tree | ca7c970d3ae513194a43f6780dda2080cce65671 | |
| parent | 2055a9cd4490861aa7ce9e1af23c0232f97552c9 (diff) | |
| parent | 852802770f735e47aadd0a1bb5b9b1b64875874b (diff) | |
| download | vcpkg-f8e13e7b8c1249c794ce3d06d7fe00b1a1304869.tar.gz vcpkg-f8e13e7b8c1249c794ce3d06d7fe00b1a1304869.zip | |
Merge pull request #1452 from UnaNancyOwen/fix_flann
Add suffix to debug libraries of FLANN
| -rw-r--r-- | ports/flann/CONTROL | 2 | ||||
| -rw-r--r-- | ports/flann/portfile.cmake | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/ports/flann/CONTROL b/ports/flann/CONTROL index 41a18ae62..ad9a5e871 100644 --- a/ports/flann/CONTROL +++ b/ports/flann/CONTROL @@ -1,3 +1,3 @@ Source: flann -Version: 1.9.1-2 +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 96f2af0e3..ba7eca546 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_configure_cmake( -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF + -DCMAKE_DEBUG_POSTFIX=-gd ) vcpkg_install_cmake() @@ -32,16 +33,16 @@ 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) - # 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) + 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.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/flann_cpp_s.lib ${CURRENT_PACKAGES_DIR}/debug/lib/flann_cpp_s.lib) + 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) endif() # Handle copyright |