diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-07-12 23:34:42 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-07-12 23:34:42 +0000 |
| commit | bd0183f85086ef7c63e445ca39484990786a71a1 (patch) | |
| tree | 0d721b62b48282011ffcb6b7891b941a8b37a659 /bench | |
| parent | e979e6485fe3c313bc3c0ec7a6bb4bcdf61e4420 (diff) | |
fix a cmake issue in FindTvmet and FindMKL
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/btl/cmake/FindMKL.cmake | 6 | ||||
| -rw-r--r-- | bench/btl/cmake/FindTvmet.cmake | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bench/btl/cmake/FindMKL.cmake b/bench/btl/cmake/FindMKL.cmake index 403dddd59..c9d86def8 100644 --- a/bench/btl/cmake/FindMKL.cmake +++ b/bench/btl/cmake/FindMKL.cmake @@ -32,13 +32,17 @@ message(STATUS ${MKL_LIBRARIES}) else(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") find_library(MKL_LIBRARIES - mkl_core mkl_intel mkl_sequential guide pthread + mkl_core PATHS $ENV{MKLLIB} /opt/intel/mkl/*/lib/32 ${LIB_INSTALL_DIR} ) +if(MKL_LIBRARIES) +set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_p4 mkl_sequential guide pthread) +endif(MKL_LIBRARIES) + endif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") endif(CMAKE_MINOR_VERSION GREATER 4) diff --git a/bench/btl/cmake/FindTvmet.cmake b/bench/btl/cmake/FindTvmet.cmake index d0704dbbe..e4eb6e370 100644 --- a/bench/btl/cmake/FindTvmet.cmake +++ b/bench/btl/cmake/FindTvmet.cmake @@ -17,15 +17,15 @@ if (TVMET_INCLUDE_DIR) else (TVMET_INCLUDE_DIR) -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Tvmet DEFAULT_MSG TVMET_INCLUDE_DIR) - find_path(TVMET_INCLUDE_DIR NAMES tvmet/tvmet.h PATHS ${TVMETDIR}/ ${INCLUDE_INSTALL_DIR} ) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Tvmet DEFAULT_MSG TVMET_INCLUDE_DIR) + mark_as_advanced(TVMET_INCLUDE_DIR) endif(TVMET_INCLUDE_DIR) |