diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2020-10-24 06:15:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 15:15:47 -0700 |
| commit | a3ed6c63900a5ff2f5622971682aa0a89873aa68 (patch) | |
| tree | f332e3f7b0e3567bd90fca363f578cf1b9b2fbd4 /ports/armadillo/remove_custom_modules.patch | |
| parent | d022499e92a9178a03dbbe558f63714c1bbe70c6 (diff) | |
| download | vcpkg-a3ed6c63900a5ff2f5622971682aa0a89873aa68.tar.gz vcpkg-a3ed6c63900a5ff2f5622971682aa0a89873aa68.zip | |
[Armadillo] update to 10.1.0 (#14159)
Diffstat (limited to 'ports/armadillo/remove_custom_modules.patch')
| -rw-r--r-- | ports/armadillo/remove_custom_modules.patch | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/ports/armadillo/remove_custom_modules.patch b/ports/armadillo/remove_custom_modules.patch index 0723dbeb5..1ce5984bf 100644 --- a/ports/armadillo/remove_custom_modules.patch +++ b/ports/armadillo/remove_custom_modules.patch @@ -1,17 +1,21 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0959127..9fea721 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -176,10 +176,9 @@ else() - include(ARMA_FindMKL) - include(ARMA_FindACMLMP) - include(ARMA_FindACML) -- include(ARMA_FindOpenBLAS) - include(ARMA_FindATLAS) -- include(ARMA_FindBLAS) -- include(ARMA_FindLAPACK) -+ find_package(BLAS) -+ find_package(LAPACK) - - message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) - message(STATUS " ACMLMP_FOUND = ${ACMLMP_FOUND}" ) +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0fb228f..2275734 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -321,14 +321,13 @@ else()
+ set(ARMA_OS unix)
+
+ include(ARMA_FindMKL)
+- include(ARMA_FindOpenBLAS)
+ include(ARMA_FindATLAS)
+- include(ARMA_FindBLAS)
+- include(ARMA_FindLAPACK)
+
+ if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
+ include(ARMA_FindFlexiBLAS)
+ endif()
++ find_package(BLAS)
++ find_package(LAPACK)
+
+ message(STATUS " MKL_FOUND = ${MKL_FOUND}" )
+ message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" )
|