mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 23:28:07 +08:00
e76c524f63
* [armadillo] Update to 10.2.0 and also update the repository * Update versions * Remove NO_REMOVE_ONE_LEVEL and update patches * Update versions/a-/armadillo.json
61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
diff --git a/cmake_aux/Modules/ARMA_FindARPACK.cmake b/cmake_aux/Modules/ARMA_FindARPACK.cmake
|
|
index 1a709ad..3029c25 100644
|
|
--- a/cmake_aux/Modules/ARMA_FindARPACK.cmake
|
|
+++ b/cmake_aux/Modules/ARMA_FindARPACK.cmake
|
|
@@ -4,6 +4,10 @@
|
|
# ARPACK_FOUND - system has ARPACK
|
|
# ARPACK_LIBRARY - Link this to use ARPACK
|
|
|
|
+if(CMAKE_DISABLE_FIND_PACKAGE_ARPACK)
|
|
+ set(ARPACK_FOUND NO)
|
|
+ return()
|
|
+endif()
|
|
|
|
find_library(ARPACK_LIBRARY
|
|
NAMES arpack
|
|
diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake
|
|
index 491a361..e40a0ff 100644
|
|
--- a/cmake_aux/Modules/ARMA_FindATLAS.cmake
|
|
+++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake
|
|
@@ -1,3 +1,8 @@
|
|
+if(CMAKE_DISABLE_FIND_PACKAGE_ATLAS)
|
|
+ set(ATLAS_FOUND NO)
|
|
+ return()
|
|
+endif()
|
|
+
|
|
find_path(ATLAS_CBLAS_INCLUDE_DIR
|
|
NAMES cblas.h
|
|
PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/
|
|
diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake
|
|
index 0fd5b06..d6bcd49 100644
|
|
--- a/cmake_aux/Modules/ARMA_FindMKL.cmake
|
|
+++ b/cmake_aux/Modules/ARMA_FindMKL.cmake
|
|
@@ -6,6 +6,11 @@
|
|
## the link below explains why we're linking only with mkl_rt
|
|
## https://software.intel.com/en-us/articles/a-new-linking-model-single-dynamic-library-mkl_rt-since-intel-mkl-103
|
|
|
|
+if(CMAKE_DISABLE_FIND_PACKAGE_MKL)
|
|
+ set(MKL_FOUND NO)
|
|
+ return()
|
|
+endif()
|
|
+
|
|
set(MKL_NAMES ${MKL_NAMES} mkl_rt)
|
|
#set(MKL_NAMES ${MKL_NAMES} mkl_lapack)
|
|
#set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread)
|
|
diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
|
|
index abf046d..e496cb0 100644
|
|
--- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
|
|
+++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake
|
|
@@ -5,6 +5,11 @@
|
|
# SuperLU_LIBRARY - Link this to use SuperLU
|
|
# SuperLU_INCLUDE_DIR - directory of SuperLU headers
|
|
|
|
+if(CMAKE_DISABLE_FIND_PACKAGE_SuperLU)
|
|
+ set(SuperLU_FOUND OFF)
|
|
+ return()
|
|
+endif()
|
|
+
|
|
find_path(SuperLU_INCLUDE_DIR slu_ddefs.h
|
|
/usr/include/superlu/
|
|
/usr/include/SuperLU/
|