[Cmake-commits] [cmake-commits] hoffman committed CheckFortranFunctionExists.cmake 1.1 1.1.2.1 FindBLAS.cmake 1.1.2.2 1.1.2.3 FindLAPACK.cmake 1.1.2.1 1.1.2.2 FindMPI.cmake 1.15.2.4 1.15.2.5 FindwxWidgets.cmake 1.18.2.3 1.18.2.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Jul 22 14:04:26 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv16460/Modules
Modified Files:
Tag: CMake-2-6
CheckFortranFunctionExists.cmake FindBLAS.cmake
FindLAPACK.cmake FindMPI.cmake FindwxWidgets.cmake
Log Message:
ENH: merge in changes from main tree for RC12
Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -C 2 -d -r1.15.2.4 -r1.15.2.5
*** FindMPI.cmake 23 Apr 2008 02:05:39 -0000 1.15.2.4
--- FindMPI.cmake 22 Jul 2008 18:04:23 -0000 1.15.2.5
***************
*** 211,219 ****
string(REGEX REPLACE "^-l" "" LIB ${LIB})
set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
! find_library(MPI_LIB ${LIB} PATHS ${MPI_LINK_PATH})
if (MPI_LIB)
list(APPEND MPI_LIBRARIES ${MPI_LIB})
else (MPI_LIB)
! status(ERROR "Unable to find MPI library ${LIB}")
endif (MPI_LIB)
endforeach(LIB)
--- 211,219 ----
string(REGEX REPLACE "^-l" "" LIB ${LIB})
set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
! find_library(MPI_LIB ${LIB} HINTS ${MPI_LINK_PATH})
if (MPI_LIB)
list(APPEND MPI_LIBRARIES ${MPI_LIB})
else (MPI_LIB)
! message(SEND_ERROR "Unable to find MPI library ${LIB}")
endif (MPI_LIB)
endforeach(LIB)
***************
*** 223,232 ****
# MPI_EXTRA_LIBRARY.
list(LENGTH MPI_LIBRARIES MPI_NUMLIBS)
! if (MPI_NUMLIBS GREATER 0)
list(GET MPI_LIBRARIES 0 MPI_LIBRARY_WORK)
set(MPI_LIBRARY ${MPI_LIBRARY_WORK} CACHE FILEPATH "MPI library to link against" FORCE)
! else (MPI_NUMLIBS GREATER 0)
! set(MPI_LIBRARY "MPI_LIBRARY-NOTFOUND" CACHE STRING "MPI library to link against" FORCE)
! endif (MPI_NUMLIBS GREATER 0)
if (MPI_NUMLIBS GREATER 1)
set(MPI_EXTRA_LIBRARY_WORK ${MPI_LIBRARIES})
--- 223,233 ----
# MPI_EXTRA_LIBRARY.
list(LENGTH MPI_LIBRARIES MPI_NUMLIBS)
! list(LENGTH MPI_LIBNAMES MPI_NUMLIBS_EXPECTED)
! if (MPI_NUMLIBS EQUAL MPI_NUMLIBS_EXPECTED)
list(GET MPI_LIBRARIES 0 MPI_LIBRARY_WORK)
set(MPI_LIBRARY ${MPI_LIBRARY_WORK} CACHE FILEPATH "MPI library to link against" FORCE)
! else (MPI_NUMLIBS EQUAL MPI_NUMLIBS_EXPECTED)
! set(MPI_LIBRARY "MPI_LIBRARY-NOTFOUND" CACHE FILEPATH "MPI library to link against" FORCE)
! endif (MPI_NUMLIBS EQUAL MPI_NUMLIBS_EXPECTED)
if (MPI_NUMLIBS GREATER 1)
set(MPI_EXTRA_LIBRARY_WORK ${MPI_LIBRARIES})
Index: FindBLAS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBLAS.cmake,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C 2 -d -r1.1.2.2 -r1.1.2.3
*** FindBLAS.cmake 25 Jun 2008 13:51:31 -0000 1.1.2.2
--- FindBLAS.cmake 22 Jul 2008 18:04:23 -0000 1.1.2.3
***************
*** 1,5 ****
# - Find BLAS library
! # This module finds an installed fortran library that implements the BLAS
! # linear-algebra interface (see http://www.netlib.org/blas/).
# The list of libraries searched for is taken
# from the autoconf macro file, acx_blas.m4 (distributed at
--- 1,5 ----
# - Find BLAS library
! # This module finds an installed fortran library that implements the BLAS
! # linear-algebra interface (see http://www.netlib.org/blas/).
# The list of libraries searched for is taken
# from the autoconf macro file, acx_blas.m4 (distributed at
***************
*** 11,24 ****
# BLAS_LINKER_FLAGS - uncached list of required linker flags (excluding -l
# and -L).
! # 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
! #
include(CheckFortranFunctionExists)
! macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list)
# This macro checks for the existence of the combination of fortran libraries
! # given by _list. If the combination is found, this macro checks (using the
# Check_Fortran_Function_Exists macro) whether can link against that library
# combination using the name of a routine given by _name using the linker
--- 11,44 ----
# BLAS_LINKER_FLAGS - uncached list of required linker flags (excluding -l
# and -L).
! # 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
! # BLAS95_FOUND - set to true if a library implementing the BLAS f95 interface
! # is found
! # BLA_STATIC if set on this determines what kind of linkage we do (static)
! # BLA_VENDOR if set checks only the specified vendor, if not set checks
! # all the posibilities
! # BLA_F95 if set on tries to find the f95 interfaces for BLAS/LAPACK
! ##########
! ### List of vendors (BLA_VENDOR) valid in this module
! ## ATLAS, PhiPACK,CXML,DXML,SunPerf,SCSL,SGIMATH,IBMESSL,Intel10_32 (intel mkl v10 32 bit),Intel10_64lp (intel mkl v10 64 bit,lp thread model, lp64 model),
! ## Intel( older versions of mkl 32 and 64 bit), ACML,Apple, NAS, Generic
! # C/CXX should be enabled to use Intel mkl
! get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
! if(NOT _LANGUAGES_ MATCHES Fortran)
! if(BLAS_FIND_REQUIRED)
! message(FATAL_ERROR "FindBLAS is Fortran-only so Fortran must be enabled.")
! else(BLAS_FIND_REQUIRED)
! message(STATUS "Looking for BLAS... - NOT found (Fortran not enabled)") #
! return()
! endif(BLAS_FIND_REQUIRED)
! endif(NOT _LANGUAGES_ MATCHES Fortran)
include(CheckFortranFunctionExists)
! macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _threads)
# This macro checks for the existence of the combination of fortran libraries
! # given by _list. If the combination is found, this macro checks (using the
# Check_Fortran_Function_Exists macro) whether can link against that library
# combination using the name of a routine given by _name using the linker
***************
*** 26,81 ****
# the link test, LIBRARIES is set to the list of complete library paths that
# have been found. Otherwise, LIBRARIES is set to FALSE.
!
# N.B. _prefix is the prefix applied to the names of all cached variables that
# are generated internally and marked advanced by this macro.
! set(_libraries_work TRUE)
! set(${LIBRARIES})
! set(_combined_name)
! foreach(_library ${_list})
! set(_combined_name ${_combined_name}_${_library})
!
! if(_libraries_work)
!
! if ( WIN32 )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS ENV LIB
! )
! endif ( WIN32 )
!
! if ( APPLE )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
! )
!
! else ( APPLE )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
! )
! endif( APPLE )
! mark_as_advanced(${_prefix}_${_library}_LIBRARY)
! set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
! set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
! endif(_libraries_work)
! endforeach(_library ${_list})
if(_libraries_work)
! # Test this combination of libraries.
! set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}})
! #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
! get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
! if(_LANGUAGES_ MATCHES Fortran)
! check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
! endif(_LANGUAGES_ MATCHES Fortran)
! set(CMAKE_REQUIRED_LIBRARIES)
! mark_as_advanced(${_prefix}${_combined_name}_WORKS)
! set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
endif(_libraries_work)
! if(NOT _libraries_work)
! set(${LIBRARIES} FALSE)
! endif(NOT _libraries_work)
! #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
endmacro(Check_Fortran_Libraries)
--- 46,106 ----
# the link test, LIBRARIES is set to the list of complete library paths that
# have been found. Otherwise, LIBRARIES is set to FALSE.
!
# N.B. _prefix is the prefix applied to the names of all cached variables that
# are generated internally and marked advanced by this macro.
! set(_libraries_work TRUE)
! set(${LIBRARIES})
! set(_combined_name)
! foreach(_library ${_list})
! set(_combined_name ${_combined_name}_${_library})
!
if(_libraries_work)
! if ( WIN32 )
! if(BLA_STATIC)
! set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib;.dll")
! endif(BLA_STATIC)
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS ENV LIB
! )
! endif ( WIN32 )
!
! if ( APPLE )
! if(BLA_STATIC)
! set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib;.dll")
! endif(BLA_STATIC)
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
! )
!
! else ( APPLE )
! if(BLA_STATIC)
! set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
! endif(BLA_STATIC)
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
! )
! endif( APPLE )
! mark_as_advanced(${_prefix}_${_library}_LIBRARY)
! set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
! set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
endif(_libraries_work)
! endforeach(_library ${_list})
! if(_libraries_work)
! # Test this combination of libraries.
! set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_threads})
! # message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
! check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
! set(CMAKE_REQUIRED_LIBRARIES)
! mark_as_advanced(${_prefix}${_combined_name}_WORKS)
! set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
! endif(_libraries_work)
! if(NOT _libraries_work)
! set(${LIBRARIES} FALSE)
! endif(NOT _libraries_work)
! #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
endmacro(Check_Fortran_Libraries)
***************
*** 83,218 ****
set(BLAS_LIBRARIES)
set(BLAS95_LIBRARIES)
!
!
! if(NOT BLAS_LIBRARIES)
# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! cblas_dgemm
! ""
! "cblas;f77blas;atlas"
! )
! endif(NOT BLAS_LIBRARIES)
# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "sgemm;dgemm;blas"
! )
! endif(NOT BLAS_LIBRARIES)
# BLAS in Alpha CXML library?
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "cxml"
! )
! endif(NOT BLAS_LIBRARIES)
# BLAS in Alpha DXML library? (now called CXML, see above)
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "dxml"
! )
! endif(NOT BLAS_LIBRARIES)
# BLAS in Sun Performance library?
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! "-xlic_lib=sunperf"
! "sunperf;sunmath"
! )
if(BLAS_LIBRARIES)
set(BLAS_LINKER_FLAGS "-xlic_lib=sunperf")
endif(BLAS_LIBRARIES)
!
! endif(NOT BLAS_LIBRARIES)
# BLAS in SCSL library? (SGI/Cray Scientific Library)
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "scsl"
! )
! endif(NOT BLAS_LIBRARIES)
# BLAS in SGIMATH library?
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "complib.sgimath"
! )
! endif(NOT BLAS_LIBRARIES)
# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "essl;blas"
! )
! endif(NOT BLAS_LIBRARIES)
!
!
! #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
--- 108,300 ----
set(BLAS_LIBRARIES)
set(BLAS95_LIBRARIES)
+ if ($ENV{BLA_VENDOR} MATCHES ".+")
+ set(BLA_VENDOR $ENV{BLA_VENDOR})
+ else ($ENV{BLA_VENDOR} MATCHES ".+")
+ if(NOT BLA_VENDOR)
+ set(BLA_VENDOR "All")
+ endif(NOT BLA_VENDOR)
+ endif ($ENV{BLA_VENDOR} MATCHES ".+")
! if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! cblas_dgemm
! ""
! "cblas;f77blas;atlas"
! ""
! )
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
# BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
! if (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "sgemm;dgemm;blas"
! ""
! )
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All")
# BLAS in Alpha CXML library?
! if (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "cxml"
! ""
! )
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")
# BLAS in Alpha DXML library? (now called CXML, see above)
! if (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "dxml"
! ""
! )
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")
# BLAS in Sun Performance library?
! if (BLA_VENDOR STREQUAL "SunPerf" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! "-xlic_lib=sunperf"
! "sunperf;sunmath"
! ""
! )
if(BLAS_LIBRARIES)
set(BLAS_LINKER_FLAGS "-xlic_lib=sunperf")
endif(BLAS_LIBRARIES)
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "SunPerf" OR BLA_VENDOR STREQUAL "All")
# BLAS in SCSL library? (SGI/Cray Scientific Library)
! if (BLA_VENDOR STREQUAL "SCSL" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "scsl"
! ""
! )
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "SCSL" OR BLA_VENDOR STREQUAL "All")
# BLAS in SGIMATH library?
! if (BLA_VENDOR STREQUAL "SGIMATH" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "complib.sgimath"
! ""
! )
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "SGIMATH" OR BLA_VENDOR STREQUAL "All")
# BLAS in IBM ESSL library? (requires generic BLAS lib, too)
! if (BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "essl;blas"
! ""
! )
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "IBMESSL" OR BLA_VENDOR STREQUAL "All")
+ #BLAS in acml library?
+ if (BLA_VENDOR STREQUAL "ACML" OR BLA_VENDOR STREQUAL "All")
+ if(NOT BLAS_LIBRARIES)
+ check_fortran_libraries(
+ BLAS_LIBRARIES
+ BLAS
+ sgemm
+ ""
+ "acml"
+ ""
+ )
+ endif(NOT BLAS_LIBRARIES)
+ endif (BLA_VENDOR STREQUAL "ACML" OR BLA_VENDOR STREQUAL "All")
! # Apple BLAS library?
! if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
+ BLAS_LIBRARIES
+ BLAS
+ cblas_dgemm
+ ""
+ "Accelerate"
+ ""
+ )
+ endif(NOT BLAS_LIBRARIES)
+ endif (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
+
+ if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
+ if ( NOT BLAS_LIBRARIES )
+ check_fortran_libraries(
BLAS_LIBRARIES
BLAS
! cblas_dgemm
""
! "vecLib"
""
)
! endif ( NOT BLAS_LIBRARIES )
! endif (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
! # Generic BLAS library?
! if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
! if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "blas"
! ""
! )
! endif(NOT BLAS_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
! #BLAS in intel mkl 10 library? (em64t 64bit)
! if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
! if (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
! if(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
! find_package(Threads)
! else(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
! find_package(Threads REQUIRED)
! endif(BLAS_FIND_QUIETLY OR NOT BLAS_FIND_REQUIRED)
! if (WIN32)
! if(BLA_F95)
! if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
BLAS95_LIBRARIES
BLAS
***************
*** 220,341 ****
""
"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)
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
! sgemm
""
! "mkl;guide;pthread"
! )
! endif(NOT BLAS_LIBRARIES)
!
!
! #BLAS in intel mkl library? (static, 32bit)
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
""
- "mkl_ia32;guide;pthread"
)
! endif(NOT BLAS_LIBRARIES)
!
! #BLAS in intel mkl library? (static, em64t 64bit)
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
sgemm
""
! "mkl_em64t;guide;pthread"
)
! endif(NOT BLAS_LIBRARIES)
!
!
! #BLAS in acml library?
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
sgemm
""
! "acml"
! )
! endif(NOT BLAS_LIBRARIES)
!
! # Apple BLAS library?
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! cblas_dgemm
! ""
! "Accelerate"
! )
!
! endif(NOT BLAS_LIBRARIES)
!
! if ( NOT BLAS_LIBRARIES )
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! cblas_dgemm
! ""
! "vecLib"
)
! endif ( NOT BLAS_LIBRARIES )
!
!
! # Generic BLAS library?
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
sgemm
""
! "blas"
)
! endif(NOT BLAS_LIBRARIES)
! if(BLAS_LIBRARIES)
set(BLAS_FOUND TRUE)
! else(BLAS_LIBRARIES)
! set(BLAS_FOUND FALSE)
! endif(BLAS_LIBRARIES)
! if(NOT BLAS_FIND_QUIETLY)
! if(BLAS_FOUND)
! message(STATUS "A library with BLAS API found.")
! else(BLAS_FOUND)
! if(BLAS_FIND_REQUIRED)
! message(FATAL_ERROR
"A required library with BLAS API not found. Please specify library location."
)
! else(BLAS_FIND_REQUIRED)
! message(STATUS
"A library with BLAS API not found. Please specify library location."
)
! endif(BLAS_FIND_REQUIRED)
! endif(BLAS_FOUND)
! endif(NOT BLAS_FIND_QUIETLY)
--- 302,453 ----
""
"mkl_blas95;mkl_intel_c;mkl_intel_thread;mkl_core;libguide40"
""
)
! endif(NOT BLAS95_LIBRARIES)
! else(BLA_F95)
! 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)
! endif(BLA_F95)
! else(WIN32)
! if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
! if(BLA_F95)
! if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
! BLAS95_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_blas95;mkl_intel;mkl_intel_thread;mkl_core;guide"
! "${CMAKE_THREAD_LIBS_INIT}"
! )
! endif(NOT BLAS95_LIBRARIES)
! else(BLA_F95)
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_intel;mkl_intel_thread;mkl_core;guide"
! "${CMAKE_THREAD_LIBS_INIT}"
! )
! endif(NOT BLAS_LIBRARIES)
! endif(BLA_F95)
! endif (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
! if (BLA_VENDOR STREQUAL "Intel10_64lp" OR BLA_VENDOR STREQUAL "All")
! if(BLA_F95)
! if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
! BLAS95_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_blas95;mkl_intel_lp64;mkl_intel_thread;mkl_core;guide"
! "${CMAKE_THREAD_LIBS_INIT}"
! )
! endif(NOT BLAS95_LIBRARIES)
! else(BLA_F95)
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_intel_lp64;mkl_intel_thread;mkl_core;guide"
! "${CMAKE_THREAD_LIBS_INIT}"
! )
! endif(NOT BLAS_LIBRARIES)
! endif(BLA_F95)
! endif (BLA_VENDOR STREQUAL "Intel10_64lp" OR BLA_VENDOR STREQUAL "All")
! endif (WIN32)
! #older vesions of intel mkl libs
! # BLAS in intel mkl library? (shared)
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
sgemm
""
! "mkl;guide"
! "${CMAKE_THREAD_LIBS_INIT}"
)
! endif(NOT BLAS_LIBRARIES)
! #BLAS in intel mkl library? (static, 32bit)
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
sgemm
""
! "mkl_ia32;guide"
! "${CMAKE_THREAD_LIBS_INIT}"
)
! endif(NOT BLAS_LIBRARIES)
! #BLAS in intel mkl library? (static, em64t 64bit)
! if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
sgemm
""
! "mkl_em64t;guide"
! "${CMAKE_THREAD_LIBS_INIT}"
)
! endif(NOT BLAS_LIBRARIES)
! endif (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
! endif (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
! if(BLA_F95)
! if(BLAS95_LIBRARIES)
! set(BLAS95_FOUND TRUE)
! else(BLAS95_LIBRARIES)
! set(BLAS95_FOUND FALSE)
! endif(BLAS95_LIBRARIES)
!
! if(NOT BLAS_FIND_QUIETLY)
! if(BLAS95_FOUND)
! message(STATUS "A library with BLAS95 API found.")
! else(BLAS95_FOUND)
! if(BLAS_FIND_REQUIRED)
! message(FATAL_ERROR
! "A required library with BLAS95 API not found. Please specify library location.")
! else(BLAS_FIND_REQUIRED)
! message(STATUS
! "A library with BLAS95 API not found. Please specify library location.")
! endif(BLAS_FIND_REQUIRED)
! endif(BLAS95_FOUND)
! endif(NOT BLAS_FIND_QUIETLY)
set(BLAS_FOUND TRUE)
! set(BLAS_LIBRARIES "${BLAS95_LIBRARIES}")
! else(BLA_F95)
! if(BLAS_LIBRARIES)
! set(BLAS_FOUND TRUE)
! else(BLAS_LIBRARIES)
! set(BLAS_FOUND FALSE)
! endif(BLAS_LIBRARIES)
! if(NOT BLAS_FIND_QUIETLY)
! if(BLAS_FOUND)
! message(STATUS "A library with BLAS API found.")
! else(BLAS_FOUND)
! if(BLAS_FIND_REQUIRED)
! message(FATAL_ERROR
"A required library with BLAS API not found. Please specify library location."
)
! else(BLAS_FIND_REQUIRED)
! message(STATUS
"A library with BLAS API not found. Please specify library location."
)
! endif(BLAS_FIND_REQUIRED)
! endif(BLAS_FOUND)
! endif(NOT BLAS_FIND_QUIETLY)
! endif(BLA_F95)
Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -C 2 -d -r1.18.2.3 -r1.18.2.4
*** FindwxWidgets.cmake 13 Jul 2008 21:55:23 -0000 1.18.2.3
--- FindwxWidgets.cmake 22 Jul 2008 18:04:23 -0000 1.18.2.4
***************
*** 396,399 ****
--- 396,404 ----
$ENV{ProgramFiles}
PATH_SUFFIXES
+ wxWidgets-2.9.4
+ wxWidgets-2.9.3
+ wxWidgets-2.9.2
+ wxWidgets-2.9.1
+ wxWidgets-2.9.0
wxWidgets-2.8.8
wxWidgets-2.8.7
***************
*** 411,414 ****
--- 416,420 ----
wxWidgets-2.7.0
wxWidgets-2.7.0-1
+ wxWidgets-2.6.4
wxWidgets-2.6.3
wxWidgets-2.6.2
***************
*** 434,443 ****
# Prefer static/shared order usually consistent with build
# settings.
IF(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR
! NAMES wxpng.lib wxpngd.lib
PATHS
! ${WX_ROOT_DIR}/lib/vc_dll # prefer shared
! ${WX_ROOT_DIR}/lib/vc_lib
DOC "Path to wxWidgets libraries?"
NO_DEFAULT_PATH
--- 440,454 ----
# Prefer static/shared order usually consistent with build
# settings.
+ IF(MINGW)
+ SET(WX_LIB_DIR_PREFIX gcc)
+ ELSE(MINGW)
+ SET(WX_LIB_DIR_PREFIX vc)
+ ENDIF(MINGW)
IF(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR
! NAMES msw/build.cfg mswd/build.cfg
PATHS
! ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared
! ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
DOC "Path to wxWidgets libraries?"
NO_DEFAULT_PATH
***************
*** 445,452 ****
ELSE(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR
! NAMES wxpng.lib wxpngd.lib
PATHS
! ${WX_ROOT_DIR}/lib/vc_lib # prefer static
! ${WX_ROOT_DIR}/lib/vc_dll
DOC "Path to wxWidgets libraries?"
NO_DEFAULT_PATH
--- 456,463 ----
ELSE(BUILD_SHARED_LIBS)
FIND_PATH(wxWidgets_LIB_DIR
! NAMES msw/build.cfg mswd/build.cfg
PATHS
! ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static
! ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll
DOC "Path to wxWidgets libraries?"
NO_DEFAULT_PATH
Index: FindLAPACK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindLAPACK.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** FindLAPACK.cmake 24 Mar 2008 22:23:26 -0000 1.1.2.1
--- FindLAPACK.cmake 22 Jul 2008 18:04:23 -0000 1.1.2.2
***************
*** 11,27 ****
# LAPACK_LINKER_FLAGS - uncached list of required linker flags (excluding -l
# and -L).
! # 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)
! macro(Check_Lapack_Libraries LIBRARIES _prefix _name _flags _list _blas)
# This macro checks for the existence of the combination of fortran libraries
! # given by _list. If the combination is found, this macro checks (using the
# Check_Fortran_Function_Exists macro) whether can link against that library
# combination using the name of a routine given by _name using the linker
--- 11,44 ----
# LAPACK_LINKER_FLAGS - uncached list of required linker flags (excluding -l
# and -L).
! # 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
+ # LAPACK95_FOUND - set to true if a library implementing the LAPACK f95
+ # interface is found
+ # BLA_STATIC if set on this determines what kind of linkage we do (static)
+ # BLA_VENDOR if set checks only the specified vendor, if not set checks
+ # all the posibilities
+ # BLA_F95 if set on tries to find the f95 interfaces for BLAS/LAPACK
+ ### List of vendors (BLA_VENDOR) valid in this module
+ ## Intel(mkl), ACML,Apple, NAS, Generic
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+ if(NOT _LANGUAGES_ MATCHES Fortran)
+ if(LAPACK_FIND_REQUIRED)
+ message(FATAL_ERROR
+ "FindLAPACK is Fortran-only so Fortran must be enabled.")
+ else(LAPACK_FIND_REQUIRED)
+ message(STATUS "Looking for LAPACK... - NOT found (Fortran not enabled)")
+ return()
+ endif(LAPACK_FIND_REQUIRED)
+ endif(NOT _LANGUAGES_ MATCHES Fortran)
include(CheckFortranFunctionExists)
set(LAPACK_FOUND FALSE)
+ set(LAPACK95_FOUND FALSE)
! macro(Check_Lapack_Libraries LIBRARIES _prefix _name _flags _list _blas _threads)
# This macro checks for the existence of the combination of fortran libraries
! # given by _list. If the combination is found, this macro checks (using the
# Check_Fortran_Function_Exists macro) whether can link against that library
# combination using the name of a routine given by _name using the linker
***************
*** 29,33 ****
# the link test, LIBRARIES is set to the list of complete library paths that
# have been found. Otherwise, LIBRARIES is set to FALSE.
!
# N.B. _prefix is the prefix applied to the names of all cached variables that
# are generated internally and marked advanced by this macro.
--- 46,50 ----
# the link test, LIBRARIES is set to the list of complete library paths that
# have been found. Otherwise, LIBRARIES is set to FALSE.
!
# N.B. _prefix is the prefix applied to the names of all cached variables that
# are generated internally and marked advanced by this macro.
***************
*** 40,51 ****
if(_libraries_work)
! IF (WIN32)
find_library(${_prefix}_${_library}_LIBRARY
NAMES ${_library}
! PATHS ENV LIB
)
! ENDIF (WIN32)
if(APPLE)
find_library(${_prefix}_${_library}_LIBRARY
NAMES ${_library}
--- 57,74 ----
if(_libraries_work)
! IF (WIN32)
! if(BLA_STATIC)
! set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib;.dll")
! endif(BLA_STATIC)
find_library(${_prefix}_${_library}_LIBRARY
NAMES ${_library}
! PATHS ENV LIB
)
! ENDIF (WIN32)
if(APPLE)
+ if(BLA_STATIC)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so;.dylib")
+ endif(BLA_STATIC)
find_library(${_prefix}_${_library}_LIBRARY
NAMES ${_library}
***************
*** 53,57 ****
)
else(APPLE)
! find_library(${_prefix}_${_library}_LIBRARY
NAMES ${_library}
PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
--- 76,83 ----
)
else(APPLE)
! if(BLA_STATIC)
! set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
! endif(BLA_STATIC)
! find_library(${_prefix}_${_library}_LIBRARY
NAMES ${_library}
PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
***************
*** 67,72 ****
if(_libraries_work)
# Test this combination of libraries.
! set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas})
! #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
set(CMAKE_REQUIRED_LIBRARIES)
--- 93,102 ----
if(_libraries_work)
# Test this combination of libraries.
! if(UNIX AND BLA_STATIC)
! set(CMAKE_REQUIRED_LIBRARIES ${_flags} "-Wl,--start-group ${${LIBRARIES}} ${_blas};-Wl,--end-group" ${_threads})
! else(UNIX AND BLA_STATIC)
! set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas} ${_threads})
! endif(UNIX AND BLA_STATIC)
! # message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
set(CMAKE_REQUIRED_LIBRARIES)
***************
*** 76,82 ****
endif(_libraries_work)
! if(NOT _libraries_work)
! set(${LIBRARIES} FALSE)
! endif(NOT _libraries_work)
endmacro(Check_Lapack_Libraries)
--- 106,114 ----
endif(_libraries_work)
! if(_libraries_work)
! set(${LIBRARIES} ${${LIBRARIES}} ${_blas})
! else(_libraries_work)
! set(${LIBRARIES} FALSE)
! endif(_libraries_work)
endmacro(Check_Lapack_Libraries)
***************
*** 94,140 ****
endif(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
if(BLAS_FOUND)
set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS})
!
! #intel lapack
! if(NOT LAPACK_LIBRARIES)
!
! check_lapack_libraries(
! LAPACK_LIBRARIES
! LAPACK
! cheev
! ""
! "mkl_lapack"
! "${BLAS_LIBRARIES}"
! )
! 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
if(NOT LAPACK_LIBRARIES)
!
! check_lapack_libraries(
! LAPACK_LIBRARIES
! LAPACK
! cheev
! ""
! "acml"
! "${BLAS_LIBRARIES}"
! )
! endif(NOT LAPACK_LIBRARIES)
!
# Apple LAPACK library?
! if(NOT LAPACK_LIBRARIES)
check_lapack_libraries(
LAPACK_LIBRARIES
--- 126,157 ----
endif(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
+
if(BLAS_FOUND)
set(LAPACK_LINKER_FLAGS ${BLAS_LINKER_FLAGS})
! if ($ENV{BLA_VENDOR} MATCHES ".+")
! set(BLA_VENDOR $ENV{BLA_VENDOR})
! else ($ENV{BLA_VENDOR} MATCHES ".+")
! if(NOT BLA_VENDOR)
! set(BLA_VENDOR "All")
! endif(NOT BLA_VENDOR)
! endif ($ENV{BLA_VENDOR} MATCHES ".+")
#acml lapack
+ if (BLA_VENDOR STREQUAL "ACML" OR BLA_VENDOR STREQUAL "All")
if(NOT LAPACK_LIBRARIES)
! check_lapack_libraries(
! LAPACK_LIBRARIES
! LAPACK
! cheev
! ""
! "acml"
! ""
! ""
! )
! endif(NOT LAPACK_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "ACML" OR BLA_VENDOR STREQUAL "All")
# Apple LAPACK library?
! if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
! if(NOT LAPACK_LIBRARIES)
check_lapack_libraries(
LAPACK_LIBRARIES
***************
*** 144,150 ****
"Accelerate"
"${BLAS_LIBRARIES}"
)
! endif(NOT LAPACK_LIBRARIES)
!
if ( NOT LAPACK_LIBRARIES )
check_lapack_libraries(
--- 161,169 ----
"Accelerate"
"${BLAS_LIBRARIES}"
+ ""
)
! endif(NOT LAPACK_LIBRARIES)
! endif (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
! if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
if ( NOT LAPACK_LIBRARIES )
check_lapack_libraries(
***************
*** 155,162 ****
"vecLib"
"${BLAS_LIBRARIES}"
)
endif ( NOT LAPACK_LIBRARIES )
!
# Generic LAPACK library?
if ( NOT LAPACK_LIBRARIES )
check_lapack_libraries(
--- 174,183 ----
"vecLib"
"${BLAS_LIBRARIES}"
+ ""
)
endif ( NOT LAPACK_LIBRARIES )
! endif (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
# Generic LAPACK library?
+ if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
if ( NOT LAPACK_LIBRARIES )
check_lapack_libraries(
***************
*** 167,189 ****
"lapack"
"${BLAS_LIBRARIES}"
)
endif ( NOT LAPACK_LIBRARIES )
!
else(BLAS_FOUND)
message(STATUS "LAPACK requires BLAS")
endif(BLAS_FOUND)
! if(LAPACK_LIBRARIES)
set(LAPACK_FOUND TRUE)
! else(LAPACK_LIBRARIES)
set(LAPACK_FOUND FALSE)
! endif(LAPACK_LIBRARIES)
! if(NOT LAPACK_FIND_QUIETLY)
if(LAPACK_FOUND)
message(STATUS "A library with LAPACK API found.")
else(LAPACK_FOUND)
if(LAPACK_FIND_REQUIRED)
! message(FATAL_ERROR
"A required library with LAPACK API not found. Please specify library location."
)
--- 188,270 ----
"lapack"
"${BLAS_LIBRARIES}"
+ ""
)
endif ( NOT LAPACK_LIBRARIES )
! endif (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
! #intel lapack
! if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
! if (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
! if(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
! find_PACKAGE(Threads)
! else(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
! find_package(Threads REQUIRED)
! endif(LAPACK_FIND_QUIETLY OR NOT LAPACK_FIND_REQUIRED)
! if (BLA_F95)
! if(NOT LAPACK95_LIBRARIES)
! check_lapack_libraries(
! LAPACK95_LIBRARIES
! LAPACK
! cheev
! ""
! "mkl_lapack95"
! "${BLAS95_LIBRARIES}"
! "${CMAKE_THREAD_LIBS_INIT}"
! )
! endif(NOT LAPACK95_LIBRARIES)
! else(BLA_F95)
! if(NOT LAPACK_LIBRARIES)
! check_lapack_libraries(
! LAPACK_LIBRARIES
! LAPACK
! cheev
! ""
! "mkl_lapack"
! "${BLAS_LIBRARIES}"
! "${CMAKE_THREAD_LIBS_INIT}"
! )
! endif(NOT LAPACK_LIBRARIES)
! endif(BLA_F95)
! endif (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX)
! endif(BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
else(BLAS_FOUND)
message(STATUS "LAPACK requires BLAS")
endif(BLAS_FOUND)
! if(BLA_F95)
! if(LAPACK95_LIBRARIES)
! set(LAPACK95_FOUND TRUE)
! else(LAPACK95_LIBRARIES)
! set(LAPACK95_FOUND FALSE)
! endif(LAPACK95_LIBRARIES)
! if(NOT LAPACK_FIND_QUIETLY)
! if(LAPACK95_FOUND)
! message(STATUS "A library with LAPACK95 API found.")
! else(LAPACK95_FOUND)
! if(LAPACK_FIND_REQUIRED)
! message(FATAL_ERROR
! "A required library with LAPACK95 API not found. Please specify library location."
! )
! else(LAPACK_FIND_REQUIRED)
! message(STATUS
! "A library with LAPACK95 API not found. Please specify library location."
! )
! endif(LAPACK_FIND_REQUIRED)
! endif(LAPACK95_FOUND)
! endif(NOT LAPACK_FIND_QUIETLY)
! set(LAPACK_FOUND "${LAPACK95_FOUND}")
! set(LAPACK_LIBRARIES "${LAPACK95_LIBRARIES}")
! else(BLA_F95)
! if(LAPACK_LIBRARIES)
set(LAPACK_FOUND TRUE)
! else(LAPACK_LIBRARIES)
set(LAPACK_FOUND FALSE)
! endif(LAPACK_LIBRARIES)
! if(NOT LAPACK_FIND_QUIETLY)
if(LAPACK_FOUND)
message(STATUS "A library with LAPACK API found.")
else(LAPACK_FOUND)
if(LAPACK_FIND_REQUIRED)
! message(FATAL_ERROR
"A required library with LAPACK API not found. Please specify library location."
)
***************
*** 194,196 ****
endif(LAPACK_FIND_REQUIRED)
endif(LAPACK_FOUND)
! endif(NOT LAPACK_FIND_QUIETLY)
--- 275,278 ----
endif(LAPACK_FIND_REQUIRED)
endif(LAPACK_FOUND)
! endif(NOT LAPACK_FIND_QUIETLY)
! endif(BLA_F95)
Index: CheckFortranFunctionExists.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CheckFortranFunctionExists.cmake,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C 2 -d -r1.1 -r1.1.2.1
*** CheckFortranFunctionExists.cmake 10 Oct 2007 21:47:36 -0000 1.1
--- CheckFortranFunctionExists.cmake 22 Jul 2008 18:04:23 -0000 1.1.2.1
***************
*** 9,13 ****
#
# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
- #
macro(CHECK_FORTRAN_FUNCTION_EXISTS FUNCTION VARIABLE)
--- 9,12 ----
***************
*** 25,29 ****
program TESTFortran
external ${FUNCTION}
! end
"
)
--- 24,29 ----
program TESTFortran
external ${FUNCTION}
! call ${FUNCTION}()
! end program TESTFortran
"
)
***************
*** 34,37 ****
--- 34,38 ----
OUTPUT_VARIABLE OUTPUT
)
+ # message(STATUS "${OUTPUT}")
if(${VARIABLE})
set(${VARIABLE} 1 CACHE INTERNAL "Have Fortran function ${FUNCTION}")
More information about the Cmake-commits
mailing list