[Cmake-commits] [cmake-commits] hoffman committed FindBLAS.cmake 1.1 1.1.2.1 FindKDE4.cmake 1.10.2.1 1.10.2.2 FindLAPACK.cmake 1.1 1.1.2.1 FindMPI.cmake 1.15 1.15.2.1 FindQt4.cmake 1.96.2.1 1.96.2.2 FindSubversion.cmake 1.2 1.2.2.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Mar 24 18:23:28 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv2066/Modules
Modified Files:
Tag: CMake-2-6
FindBLAS.cmake FindKDE4.cmake FindLAPACK.cmake FindMPI.cmake
FindQt4.cmake FindSubversion.cmake
Log Message:
ENH: merge in from CVS
Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C 2 -d -r1.15 -r1.15.2.1
*** FindMPI.cmake 8 Mar 2008 00:58:29 -0000 1.15
--- FindMPI.cmake 24 Mar 2008 22:23:26 -0000 1.15.2.1
***************
*** 149,153 ****
endif (MPI_NUMLIBS GREATER 0)
if (MPI_NUMLIBS GREATER 1)
! cdr(MPI_EXTRA_LIBRARY ${MPI_LIBRARIES})
else (MPI_NUMLIBS GREATER 1)
set(MPI_EXTRA_LIBRARY "MPI_EXTRA_LIBRARY-NOTFOUND")
--- 149,154 ----
endif (MPI_NUMLIBS GREATER 0)
if (MPI_NUMLIBS GREATER 1)
! set(MPI_EXTRA_LIBRARY ${MPI_LIBRARIES})
! list(REMOVE_AT MPI_EXTRA_LIBRARY 0)
else (MPI_NUMLIBS GREATER 1)
set(MPI_EXTRA_LIBRARY "MPI_EXTRA_LIBRARY-NOTFOUND")
Index: FindKDE4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE4.cmake,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C 2 -d -r1.10.2.1 -r1.10.2.2
*** FindKDE4.cmake 18 Mar 2008 14:23:51 -0000 1.10.2.1
--- FindKDE4.cmake 24 Mar 2008 22:23:26 -0000 1.10.2.2
***************
*** 45,53 ****
GET_FILENAME_COMPONENT(KDE4_DATA_DIR "${KDE4_DATA_DIR}" PATH)
ELSE(CMAKE_CROSSCOMPILING)
! # then ask kde4-config for the kde data dirs
! EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
! FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
! # then check the data dirs for FindKDE4Internal.cmake
! FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
ENDIF(CMAKE_CROSSCOMPILING)
ENDIF(NOT KDE4_DATA_DIR)
--- 45,53 ----
GET_FILENAME_COMPONENT(KDE4_DATA_DIR "${KDE4_DATA_DIR}" PATH)
ELSE(CMAKE_CROSSCOMPILING)
! # then ask kde4-config for the kde data dirs
! EXECUTE_PROCESS(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
! FILE(TO_CMAKE_PATH "${_data_DIR}" _data_DIR)
! # then check the data dirs for FindKDE4Internal.cmake
! FIND_PATH(KDE4_DATA_DIR cmake/modules/FindKDE4Internal.cmake ${_data_DIR})
ENDIF(CMAKE_CROSSCOMPILING)
ENDIF(NOT KDE4_DATA_DIR)
***************
*** 56,74 ****
IF (KDE4_DATA_DIR)
! SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
! IF (KDE4_FIND_QUIETLY)
! SET(_quiet QUIET)
! ENDIF (KDE4_FIND_QUIETLY)
! IF (KDE4_FIND_REQUIRED)
! SET(_req REQUIRED)
! ENDIF (KDE4_FIND_REQUIRED)
! # use FindKDE4Internal.cmake to do the rest
! FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
ELSE (KDE4_DATA_DIR)
! IF (KDE4_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
! ENDIF (KDE4_FIND_REQUIRED)
ENDIF (KDE4_DATA_DIR)
--- 56,74 ----
IF (KDE4_DATA_DIR)
! SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${KDE4_DATA_DIR}/cmake/modules)
! IF (KDE4_FIND_QUIETLY)
! SET(_quiet QUIET)
! ENDIF (KDE4_FIND_QUIETLY)
! IF (KDE4_FIND_REQUIRED)
! SET(_req REQUIRED)
! ENDIF (KDE4_FIND_REQUIRED)
! # use FindKDE4Internal.cmake to do the rest
! FIND_PACKAGE(KDE4Internal ${_req} ${_quiet})
ELSE (KDE4_DATA_DIR)
! IF (KDE4_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "ERROR: cmake/modules/FindKDE4Internal.cmake not found in ${_data_DIR}")
! ENDIF (KDE4_FIND_REQUIRED)
ENDIF (KDE4_DATA_DIR)
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.1
retrieving revision 1.96.2.2
diff -C 2 -d -r1.96.2.1 -r1.96.2.2
*** FindQt4.cmake 18 Mar 2008 14:23:52 -0000 1.96.2.1
--- FindQt4.cmake 24 Mar 2008 22:23:26 -0000 1.96.2.2
***************
*** 3,11 ****
# The most important issue is that the Qt4 qmake is available via the system path.
# This qmake is then used to detect basically everything else.
! # This module defines a number of key variables and macros. First is
! # QT_USE_FILE which is the path to a CMake file that can be included to compile
! # Qt 4 applications and libraries. By default, the QtCore and QtGui
# libraries are loaded. This behavior can be changed by setting one or more
! # of the following variables to true:
# QT_DONT_USE_QTCORE
# QT_DONT_USE_QTGUI
--- 3,11 ----
# The most important issue is that the Qt4 qmake is available via the system path.
# This qmake is then used to detect basically everything else.
! # This module defines a number of key variables and macros.
! # First is QT_USE_FILE which is the path to a CMake file that can be included
! # to compile Qt 4 applications and libraries. By default, the QtCore and QtGui
# libraries are loaded. This behavior can be changed by setting one or more
! # of the following variables to true before doing INCLUDE(${QT_USE_FILE}):
# QT_DONT_USE_QTCORE
# QT_DONT_USE_QTGUI
***************
*** 31,37 ****
# QT_USE_PHONON
#
! # All the libraries required are stored in a variable called QT_LIBRARIES.
! # Add this variable to your TARGET_LINK_LIBRARIES. Inlcudes and definitions
! # needed for compiling Qt code is already set up by including the QT_USE_FILE.
#
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
--- 31,49 ----
# QT_USE_PHONON
#
! # The file pointed to by QT_USE_FILE will set up your compile environment
! # by adding include directories, preprocessor defines, and populate a
! # QT_LIBRARIES variable containing all the Qt libraries and their dependencies.
! # Add the QT_LIBRARIES variable to your TARGET_LINK_LIBRARIES.
! #
! # Typical usage could be something like:
! # FIND_PACKAGE(Qt4)
! # SET(QT_USE_QTXML 1)
! # INCLUDE(${QT_USE_FILE})
! # ADD_EXECUTABLE(myexe main.cpp)
! # TARGET_LINK_LIBRARIES(myexe ${QT_LIBRARIES})
! #
! #
! # There are also some files that need processing by some Qt tools such as moc
! # and uic. Listed below are macros that may be used to process those files.
#
# macro QT4_WRAP_CPP(outfiles inputfile ... OPTIONS ...)
***************
*** 123,128 ****
# QT_QTXMLPATTERNS_FOUND True if QtXmlPatterns was found.
# QT_PHONON_FOUND True if phonon was found.
! #
# QT_DEFINITIONS Definitions to use when compiling code that uses Qt.
#
# QT_INCLUDES List of paths to all include directories of
--- 135,145 ----
# QT_QTXMLPATTERNS_FOUND True if QtXmlPatterns was found.
# QT_PHONON_FOUND True if phonon was found.
! #
! #
# QT_DEFINITIONS Definitions to use when compiling code that uses Qt.
+ # You do not need to use this if you include QT_USE_FILE.
+ # The QT_USE_FILE will also define QT_DEBUG and QT_NO_DEBUG
+ # to fit your current build type. Those are not contained
+ # in QT_DEFINITIONS.
#
# QT_INCLUDES List of paths to all include directories of
***************
*** 131,135 ****
--- 148,157 ----
# all other INCLUDE_DIRS are
# only added if they are found.
+ # You do not need to use this if you include QT_USE_FILE.
#
+ #
+ # Include directories for the Qt modules are listed here.
+ # You do not need to use these variables if you include QT_USE_FILE.
+ #
# QT_INCLUDE_DIR Path to "include" of Qt4
# QT_QT_INCLUDE_DIR Path to "include/Qt"
***************
*** 162,166 ****
#
# The Qt toolkit may contain both debug and release libraries.
! # In that case, the following library variables will contain both.
#
# QT_QT3SUPPORT_LIBRARY The Qt3Support library
--- 184,190 ----
#
# The Qt toolkit may contain both debug and release libraries.
! # In that case, the following library variables will contain both.
! # You do not need to use these variables if you include QT_USE_FILE,
! # and use QT_LIBRARIES.
#
# QT_QT3SUPPORT_LIBRARY The Qt3Support library
***************
*** 1272,1275 ****
--- 1296,1300 ----
SET(QT_QTNETWORK_LIB_DEPENDENCIES "")
SET(QT_QTOPENGL_LIB_DEPENDENCIES "")
+ SET(QT_QTDBUS_LIB_DEPENDENCIES "")
SET(QT_QTHELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY})
***************
*** 1371,1407 ****
## openssl
! IF(QT_QCONFIG MATCHES "openssl")
FIND_PACKAGE(OpenSSL)
SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
! ENDIF(QT_QCONFIG MATCHES "openssl")
## glib
IF(QT_QCONFIG MATCHES "glib")
# Qt 4.2.0+ uses glib-2.0
! EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0
! OUTPUT_VARIABLE _glib_query_output
! RESULT_VARIABLE _glib_result
! ERROR_VARIABLE _glib_query_output )
! IF(_glib_result MATCHES 0)
! STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
! SEPARATE_ARGUMENTS(_glib_query_output)
! ELSE(_glib_result MATCHES 0)
! SET(_glib_query_output)
! MESSAGE(WARNING "When querying pkg-config for glib-2.0. An error was reported:\n${_glib_query_output}")
! ENDIF(_glib_result MATCHES 0)
! FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
! FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
! IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
! MESSAGE(WARNING "Unable to find glib 2.0 to satisfy Qt dependency.")
! ELSE(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
! SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
! ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
! ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
! MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
! MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "glib")
--- 1396,1464 ----
## openssl
! IF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
FIND_PACKAGE(OpenSSL)
SET(QT_QTNETWORK_LIB_DEPENDENCIES ${QT_QTNETWORK_LIB_DEPENDENCIES} ${OPENSSL_LIBRARIES})
! ENDIF(QT_QCONFIG MATCHES "openssl" AND NOT Q_WS_WIN)
!
! ## qdbus
! IF(QT_QCONFIG MATCHES "qdbus")
!
! # if the dbus library isn't found, we'll assume its not required to build
! # shared Qt on Linux doesn't require it
! IF(NOT QT_DBUS_LIBRARY)
! EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L dbus-1
! OUTPUT_VARIABLE _dbus_query_output
! RESULT_VARIABLE _dbus_result
! ERROR_VARIABLE _dbus_query_output )
!
! IF(_dbus_result MATCHES 0)
! STRING(REPLACE "-L" "" _dbus_query_output "${_dbus_query_output}")
! SEPARATE_ARGUMENTS(_dbus_query_output)
! ELSE(_dbus_result MATCHES 0)
! SET(_dbus_query_output)
! ENDIF(_dbus_result MATCHES 0)
!
! FIND_LIBRARY(QT_DBUS_LIBRARY NAMES dbus-1 PATHS ${_dbus_query_output} )
!
! IF(QT_DBUS_LIBRARY)
! SET(QT_QTDBUS_LIB_DEPENDENCIES ${QT_QTDBUS_LIB_DEPENDENCIES} ${QT_DBUS_LIBRARY})
! ENDIF(QT_DBUS_LIBRARY)
!
! MARK_AS_ADVANCED(QT_DBUS_LIBRARY)
! ENDIF(NOT QT_DBUS_LIBRARY)
!
! ENDIF(QT_QCONFIG MATCHES "qdbus")
## glib
IF(QT_QCONFIG MATCHES "glib")
+
+ # if the glib libraries aren't found, we'll assume its not required to build
+ # shared Qt on Linux doesn't require it
+
# Qt 4.2.0+ uses glib-2.0
! IF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
! EXECUTE_PROCESS(COMMAND pkg-config --libs-only-L glib-2.0 gthread-2.0
! OUTPUT_VARIABLE _glib_query_output
! RESULT_VARIABLE _glib_result
! ERROR_VARIABLE _glib_query_output )
! IF(_glib_result MATCHES 0)
! STRING(REPLACE "-L" "" _glib_query_output "${_glib_query_output}")
! SEPARATE_ARGUMENTS(_glib_query_output)
! ELSE(_glib_result MATCHES 0)
! SET(_glib_query_output)
! ENDIF(_glib_result MATCHES 0)
! FIND_LIBRARY(QT_GLIB_LIBRARY NAMES glib-2.0 PATHS ${_glib_query_output} )
! FIND_LIBRARY(QT_GTHREAD_LIBRARY NAMES gthread-2.0 PATHS ${_glib_query_output} )
! IF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
! SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES}
! ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
! ENDIF(QT_GLIB_LIBRARY AND QT_GTHREAD_LIBRARY)
! MARK_AS_ADVANCED(QT_GLIB_LIBRARY)
! MARK_AS_ADVANCED(QT_GTHREAD_LIBRARY)
! ENDIF(NOT QT_GLIB_LIBRARY OR NOT QT_GTHREAD_LIBRARY)
ENDIF(QT_QCONFIG MATCHES "glib")
***************
*** 1455,1459 ****
IF(found_qt_minor_vers GREATER 1)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit")
! ENDIF(found_qt_minor_vers LESS 1)
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
--- 1512,1516 ----
IF(found_qt_minor_vers GREATER 1)
SET(QT_QTGUI_LIB_DEPENDENCIES ${QT_QTGUI_LIB_DEPENDENCIES} "-framework AppKit")
! ENDIF(found_qt_minor_vers GREATER 1)
SET(QT_QTCORE_LIB_DEPENDENCIES ${QT_QTCORE_LIB_DEPENDENCIES} "-framework ApplicationServices")
Index: FindBLAS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBLAS.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** FindBLAS.cmake 10 Oct 2007 21:47:36 -0000 1.1
--- FindBLAS.cmake 24 Mar 2008 22:23:26 -0000 1.1.2.1
***************
*** 13,16 ****
--- 13,17 ----
# BLAS_LIBRARIES - uncached list of libraries (using full path name) to
# link against to use BLAS
+ # BLAS95_LIBRARIES - uncached list of libraries (using full path name) # to link against to use BLAS95 interface
#
***************
*** 36,39 ****
--- 37,47 ----
if(_libraries_work)
+
+ if ( WIN32 )
+ find_library(${_prefix}_${_library}_LIBRARY
+ NAMES ${_library}
+ PATHS ENV LIB
+ )
+ endif ( WIN32 )
if ( APPLE )
***************
*** 71,74 ****
--- 79,83 ----
set(BLAS_LINKER_FLAGS)
set(BLAS_LIBRARIES)
+ set(BLAS95_LIBRARIES)
***************
*** 169,172 ****
--- 178,238 ----
+ #BLAS in intel mkl 10 library? (em64t 64bit)
+ if(NOT BLAS_LIBRARIES)
+ check_fortran_libraries(
+ BLAS_LIBRARIES
+ BLAS
+ sgemm
+ ""
+ "mkl_intel_lp64;mkl_intel_thread;mkl_core;guide;pthread"
+ )
+ endif(NOT BLAS_LIBRARIES)
+ if(NOT BLAS95_LIBRARIES)
+ check_fortran_libraries(
+ BLAS95_LIBRARIES
+ BLAS
+ sgemm
+ ""
+ "mkl_blas95;mkl_intel_lp64;mkl_intel_thread;mkl_core;guide;pthread"
+ )
+ endif(NOT BLAS95_LIBRARIES)
+
+ ### windows version of intel mkl 10
+
+ if(NOT BLAS_LIBRARIES)
+ check_fortran_libraries(
+ BLAS_LIBRARIES
+ BLAS
+ SGEMM
+ ""
+ "mkl_c_dll;mkl_intel_thread_dll;mkl_core_dll;libguide40"
+ )
+ endif(NOT BLAS_LIBRARIES)
+
+ if(NOT BLAS95_LIBRARIES)
+ check_fortran_libraries(
+ BLAS95_LIBRARIES
+ BLAS
+ sgemm
+ ""
+ "mkl_blas95;mkl_intel_c;mkl_intel_thread;mkl_core;libguide40"
+ )
+ endif(NOT BLAS95_LIBRARIES)
+
+
+ # linux 32 bit
+ if(NOT BLAS95_LIBRARIES)
+ check_fortran_libraries(
+ BLAS95_LIBRARIES
+ BLAS
+ sgemm
+ ""
+ "mkl_blas95;mkl_intel;mkl_intel_thread;mkl_core;guide;pthread"
+ )
+ endif(NOT BLAS95_LIBRARIES)
+
+
+ #older vesions of intel mkl libs
+
# BLAS in intel mkl library? (shared)
if(NOT BLAS_LIBRARIES)
***************
*** 180,183 ****
--- 246,250 ----
endif(NOT BLAS_LIBRARIES)
+
#BLAS in intel mkl library? (static, 32bit)
if(NOT BLAS_LIBRARIES)
***************
*** 214,219 ****
endif(NOT BLAS_LIBRARIES)
-
-
# Apple BLAS library?
if(NOT BLAS_LIBRARIES)
--- 281,284 ----
Index: FindSubversion.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSubversion.cmake,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C 2 -d -r1.2 -r1.2.2.1
*** FindSubversion.cmake 14 Jan 2008 22:19:20 -0000 1.2
--- FindSubversion.cmake 24 Mar 2008 22:23:26 -0000 1.2.2.1
***************
*** 68,72 ****
MACRO(Subversion_WC_INFO dir prefix)
EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version
! WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE Subversion_VERSION_SVN
OUTPUT_STRIP_TRAILING_WHITESPACE)
--- 68,72 ----
MACRO(Subversion_WC_INFO dir prefix)
EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version
! WORKING_DIRECTORY ${dir}
OUTPUT_VARIABLE Subversion_VERSION_SVN
OUTPUT_STRIP_TRAILING_WHITESPACE)
Index: FindLAPACK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLAPACK.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** FindLAPACK.cmake 10 Oct 2007 21:47:36 -0000 1.1
--- FindLAPACK.cmake 24 Mar 2008 22:23:26 -0000 1.1.2.1
***************
*** 13,18 ****
# LAPACK_LIBRARIES - uncached list of libraries (using full path name) to
# link against to use LAPACK
! #
include(CheckFortranFunctionExists)
set(LAPACK_FOUND FALSE)
--- 13,21 ----
# LAPACK_LIBRARIES - uncached list of libraries (using full path name) to
# link against to use LAPACK
! # LAPACK95_LIBRARIES - uncached list of libraries (using full path name) to
! # link against to use LAPACK95
+ #
+
include(CheckFortranFunctionExists)
set(LAPACK_FOUND FALSE)
***************
*** 37,40 ****
--- 40,50 ----
if(_libraries_work)
+ IF (WIN32)
+ find_library(${_prefix}_${_library}_LIBRARY
+ NAMES ${_library}
+ PATHS ENV LIB
+ )
+ ENDIF (WIN32)
+
if(APPLE)
find_library(${_prefix}_${_library}_LIBRARY
***************
*** 75,78 ****
--- 85,89 ----
set(LAPACK_LINKER_FLAGS)
set(LAPACK_LIBRARIES)
+ set(LAPACK95_LIBRARIES)
***************
*** 99,103 ****
endif(NOT LAPACK_LIBRARIES)
!
#acml lapack
--- 110,123 ----
endif(NOT LAPACK_LIBRARIES)
! if(NOT LAPACK95_LIBRARIES)
! check_lapack_libraries(
! LAPACK95_LIBRARIES
! LAPACK
! cheev
! ""
! "mkl_lapack95"
! "${BLAS_LIBRARIES}"
! )
! endif(NOT LAPACK95_LIBRARIES)
#acml lapack
***************
*** 138,145 ****
endif ( NOT LAPACK_LIBRARIES )
-
-
-
-
# Generic LAPACK library?
if ( NOT LAPACK_LIBRARIES )
--- 158,161 ----
More information about the Cmake-commits
mailing list