diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-07-12 21:54:02 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-07-12 21:54:02 +0000 |
| commit | 10c4e36b39f96a40558ffde48d0f698be8ef7433 (patch) | |
| tree | fc285c056a3196c15ca2c6b6a53deb5cc5314435 /bench/btl | |
| parent | ed6e07b2f6d91fa34253f97d13049d7cbabf6a34 (diff) | |
disable MKL check and fortran for cmake <2.6
Diffstat (limited to 'bench/btl')
| -rw-r--r-- | bench/btl/cmake/FindMKL.cmake | 9 | ||||
| -rw-r--r-- | bench/btl/libs/f77/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/bench/btl/cmake/FindMKL.cmake b/bench/btl/cmake/FindMKL.cmake index 60190eff0..403dddd59 100644 --- a/bench/btl/cmake/FindMKL.cmake +++ b/bench/btl/cmake/FindMKL.cmake @@ -11,13 +11,10 @@ find_path(MKL_INCLUDES ${INCLUDE_INSTALL_DIR} ) - -message(STATUS ${CMAKE_HOST_SYSTEM_PROCESSOR}) +if(CMAKE_MINOR_VERSION GREATER 4) if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") -message(STATUS "64 bits") - find_library(MKL_LIBRARIES mkl_core PATHS @@ -34,8 +31,6 @@ message(STATUS ${MKL_LIBRARIES}) else(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") -message(STATUS "32 bits") - find_library(MKL_LIBRARIES mkl_core mkl_intel mkl_sequential guide pthread PATHS @@ -46,6 +41,8 @@ find_library(MKL_LIBRARIES endif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") +endif(CMAKE_MINOR_VERSION GREATER 4) + include(FindPackageHandleStandardArgs) find_package_handle_standard_args(MKL DEFAULT_MSG MKL_INCLUDES MKL_LIBRARIES) diff --git a/bench/btl/libs/f77/CMakeLists.txt b/bench/btl/libs/f77/CMakeLists.txt index 03d0c6167..4a6c33b0a 100644 --- a/bench/btl/libs/f77/CMakeLists.txt +++ b/bench/btl/libs/f77/CMakeLists.txt @@ -1,3 +1,4 @@ - -enable_language(Fortran) -btl_add_bench(btl_f77 main.cpp dmxv.f smxv.f dmxm.f smxm.f daxpy.f saxpy.f data.f sata.f daat.f saat.f) +if(CMAKE_MINOR_VERSION GREATER 4) + enable_language(Fortran) + btl_add_bench(btl_f77 main.cpp dmxv.f smxv.f dmxm.f smxm.f daxpy.f saxpy.f data.f sata.f daat.f saat.f) +endif(CMAKE_MINOR_VERSION GREATER 4)
\ No newline at end of file |