aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Li <seanlishuo@gmail.com>2017-06-16 22:23:37 +0800
committerSean Li <seanlishuo@gmail.com>2017-06-16 22:23:37 +0800
commit45cc143b2628b70e33f19676a7ca14ff681e5e97 (patch)
treef47b110147fade6214de2196cbe535d3d93681dc
parentc626675abb963d15f5d290a56005556d95b160bd (diff)
downloadvcpkg-45cc143b2628b70e33f19676a7ca14ff681e5e97.tar.gz
vcpkg-45cc143b2628b70e33f19676a7ca14ff681e5e97.zip
Add WINDOWS_EXPORT_ALL_SYMBOLS property to flann_cpp only.
-rw-r--r--ports/flann/CONTROL2
-rw-r--r--ports/flann/export-all-symbols-of-flann-cpp.patch12
-rw-r--r--ports/flann/portfile.cmake11
3 files changed, 23 insertions, 2 deletions
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()