diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/mlpack/cmakelists.patch | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'ports/mlpack/cmakelists.patch')
| -rw-r--r-- | ports/mlpack/cmakelists.patch | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/ports/mlpack/cmakelists.patch b/ports/mlpack/cmakelists.patch index bc251980a..6c39a4293 100644 --- a/ports/mlpack/cmakelists.patch +++ b/ports/mlpack/cmakelists.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -252,7 +252,7 @@
+@@ -284,7 +284,7 @@
# script Armadillo uses to find these.
if (WIN32)
find_library(LAPACK_LIBRARY
@@ -9,7 +9,7 @@ PATHS "C:/Program Files/Armadillo"
PATH_SUFFIXES "examples/lib_win32/")
-@@ -261,7 +261,7 @@
+@@ -293,7 +293,7 @@
endif ()
find_library(BLAS_LIBRARY
@@ -18,17 +18,7 @@ PATHS "C:/Program Files/Armadillo"
PATH_SUFFIXES "examples/lib_win32/")
-@@ -281,6 +281,9 @@
- # Unfortunately this configuration variable is necessary and will need to be
- # updated as time goes on and new versions are released.
- set(Boost_ADDITIONAL_VERSIONS
-+ "1.69.0" "1.69"
-+ "1.68.0" "1.68"
-+ "1.67.0" "1.67"
- "1.66.0" "1.66"
- "1.65.1" "1.65.0" "1.65"
- "1.64.1" "1.64.0" "1.64"
-@@ -307,19 +310,11 @@
+@@ -392,19 +392,11 @@
REQUIRED
)
|