From fe5834ce6681fd365ce0f35dc9d7a2d8c4ceb109 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 27 Aug 2009 16:41:16 +0000
Subject: [PATCH] more tweaks for samtech
---
CMakeLists.txt | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dbd8dab38..5a7a7878bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,24 +149,21 @@ if(ENABLE_BLAS_LAPACK)
else(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(MKL_PATH ia32/lib)
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(MSVC_MKL_REQUIRED libguide mkl_c mkl_intel_c mkl_intel_thread mkl_core)
- find_all_libraries(MSVC_MKL_LIBRARIES MSVC_MKL_REQUIRED ${MKL_PATH})
- if(MSVC_MKL_LIBRARIES)
- set(LAPACK_LIBRARIES ${MKL_MSVC_LIBRARIES})
+ set(MKL_LIBS_REQUIRED libguide mkl_c mkl_intel_c mkl_intel_thread mkl_core)
+ find_all_libraries(LAPACK_LIBRARIES MKL_LIBS_REQUIRED ${MKL_PATH})
+ if(LAPACK_LIBRARIES)
set(HAVE_BLAS TRUE)
set(HAVE_LAPACK TRUE)
list(APPEND CONFIG_OPTIONS "IntelBlas" "IntelLapack")
- endif(MSVC_MKL_LIBRARIES)
- if(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
- set(MSVC_REF_REQUIRED lapack blas g2c gcc)
- find_all_libraries(MSVC_REF_LIBRARIES MSVC_REF_REQUIRED "")
- if(MSVC_REF_LIBRARIES)
- set(LAPACK_LIBRARIES ${MSVC_REF_LIBRARIES})
+ else(LAPACK_LIBRARIES)
+ set(REFLAPACK_LIBS_REQUIRED lapack blas g2c gcc)
+ find_all_libraries(LAPACK_LIBRARIES REFLAPACK_LIBS_REQUIRED "")
+ if(LAPACK_LIBRARIES)
set(HAVE_BLAS TRUE)
set(HAVE_LAPACK TRUE)
list(APPEND CONFIG_OPTIONS "RefBlas" "RefLapack")
- endif(MSVC_REF_LIBRARIES)
- endif(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
+ endif(LAPACK_LIBRARIES)
+ endif(LAPACK_LIBRARIES)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
# on Linux also try to find the Intel MKL without a Fortran
# compiler
@@ -175,14 +172,13 @@ if(ENABLE_BLAS_LAPACK)
else(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(MKL_PATH lib/32)
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(LINUX_MKL_REQUIRED guide mkl_gf_lp64 iomp5 mkl_gnu_thread mkl_core)
- find_all_libraries(LINUX_MKL_LIBRARIES LINUX_MKL_REQUIRED ${MKL_PATH})
- if(LINUX_MKL_LIBRARIES)
- set(LAPACK_LIBRARIES ${LINUX_MKL_LIBRARIES})
+ set(MKL_LIBS_REQUIRED guide mkl_gf_lp64 iomp5 mkl_gnu_thread mkl_core)
+ find_all_libraries(LAPACK_LIBRARIES MKL_LIBS_REQUIRED ${MKL_PATH})
+ if(LAPACK_LIBRARIES)
set(HAVE_BLAS TRUE)
set(HAVE_LAPACK TRUE)
list(APPEND CONFIG_OPTIONS "IntelBlas" "IntelLapack")
- endif(LINUX_MKL_LIBRARIES)
+ endif(LAPACK_LIBRARIES)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
# on SunOS we know blas and lapack are available in sunperf
set(HAVE_BLAS TRUE)
--
GitLab