mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 00:51:36 +08:00
46 lines
1.2 KiB
Diff
46 lines
1.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 5b27e3c..78d3952 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -260,7 +260,6 @@ message(STATUS "*** Looking for external libraries")
|
|
## Find LAPACK and BLAS libraries, or their optimised versions
|
|
##
|
|
|
|
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake_aux/Modules/")
|
|
|
|
if(APPLE)
|
|
message(STATUS "Detected macOS")
|
|
@@ -331,11 +330,16 @@ else()
|
|
set(FlexiBLAS_FOUND false)
|
|
endif()
|
|
|
|
+ if(0)
|
|
include(ARMA_FindMKL)
|
|
include(ARMA_FindOpenBLAS)
|
|
include(ARMA_FindATLAS) # TODO: remove support for ATLAS in next major version
|
|
include(ARMA_FindBLAS)
|
|
include(ARMA_FindLAPACK)
|
|
+ else()
|
|
+ find_package(BLAS REQUIRED)
|
|
+ find_package(LAPACK REQUIRED)
|
|
+ endif()
|
|
|
|
message(STATUS "FlexiBLAS_FOUND = ${FlexiBLAS_FOUND}" )
|
|
message(STATUS " MKL_FOUND = ${MKL_FOUND}" )
|
|
@@ -449,7 +453,6 @@ else()
|
|
endif()
|
|
|
|
|
|
-include(ARMA_FindARPACK)
|
|
message(STATUS "ARPACK_FOUND = ${ARPACK_FOUND}")
|
|
|
|
if(ARPACK_FOUND)
|
|
@@ -457,7 +460,6 @@ if(ARPACK_FOUND)
|
|
set(ARMA_LIBS ${ARMA_LIBS} ${ARPACK_LIBRARY})
|
|
endif()
|
|
|
|
-include(ARMA_FindSuperLU5)
|
|
message(STATUS "SuperLU_FOUND = ${SuperLU_FOUND}")
|
|
|
|
if(SuperLU_FOUND)
|