diff options
| author | Sean Li <seanlishuo@gmail.com> | 2017-06-17 12:09:44 +0800 |
|---|---|---|
| committer | Sean Li <seanlishuo@gmail.com> | 2017-06-17 12:09:44 +0800 |
| commit | 5c5affcc2928a611ccbefc1fe37d6bc66720a33c (patch) | |
| tree | b06eefc2b4b7d136dd383c89889b7b0a00f7dba0 | |
| parent | 47909aff3ed07f28ab0ccb23ec69a8908048fc7a (diff) | |
| download | vcpkg-5c5affcc2928a611ccbefc1fe37d6bc66720a33c.tar.gz vcpkg-5c5affcc2928a611ccbefc1fe37d6bc66720a33c.zip | |
Revert previous patch rather than deleting it.
| -rw-r--r-- | ports/flann/Revert-fix-install-flann.patch | 41 | ||||
| -rw-r--r-- | ports/flann/fix-install-flann.patch | 41 | ||||
| -rw-r--r-- | ports/flann/portfile.cmake | 5 |
3 files changed, 86 insertions, 1 deletions
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( |