fix a cmake issue in FindTvmet and FindMKL

This commit is contained in:
Gael Guennebaud 2008-07-12 23:34:42 +00:00
parent e979e6485f
commit bd0183f850
2 changed files with 8 additions and 4 deletions

View File

@ -32,13 +32,17 @@ message(STATUS ${MKL_LIBRARIES})
else(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") else(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
find_library(MKL_LIBRARIES find_library(MKL_LIBRARIES
mkl_core mkl_intel mkl_sequential guide pthread mkl_core
PATHS PATHS
$ENV{MKLLIB} $ENV{MKLLIB}
/opt/intel/mkl/*/lib/32 /opt/intel/mkl/*/lib/32
${LIB_INSTALL_DIR} ${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_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
endif(CMAKE_MINOR_VERSION GREATER 4) endif(CMAKE_MINOR_VERSION GREATER 4)

View File

@ -17,15 +17,15 @@ if (TVMET_INCLUDE_DIR)
else (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 find_path(TVMET_INCLUDE_DIR NAMES tvmet/tvmet.h
PATHS PATHS
${TVMETDIR}/ ${TVMETDIR}/
${INCLUDE_INSTALL_DIR} ${INCLUDE_INSTALL_DIR}
) )
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Tvmet DEFAULT_MSG TVMET_INCLUDE_DIR)
mark_as_advanced(TVMET_INCLUDE_DIR) mark_as_advanced(TVMET_INCLUDE_DIR)
endif(TVMET_INCLUDE_DIR) endif(TVMET_INCLUDE_DIR)