mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-09 14:59:02 +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
24 lines
647 B
Diff
24 lines
647 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ab7dbed..ea5516e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -324,15 +324,15 @@ if(APPLE)
|
|
else()
|
|
|
|
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}" )
|
|
message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" )
|