mirror of https://github.com/CGAL/cgal
Bug fix: fixed MKL support in FindBLAS.cmake and FindLAPACK.cmake
This commit is contained in:
parent
acd693c418
commit
c7f102ece4
|
|
@ -113,6 +113,7 @@ GraphicsView/src/CGALQt4/*.so
|
||||||
GraphicsView/src/CGALQt4/Makefile
|
GraphicsView/src/CGALQt4/Makefile
|
||||||
GraphicsView/src/CGALQt4/moc_*.cxx
|
GraphicsView/src/CGALQt4/moc_*.cxx
|
||||||
GraphicsView/src/CGALQt4/qrc_*.cxx
|
GraphicsView/src/CGALQt4/qrc_*.cxx
|
||||||
|
Installation/cmake/modules/*.tmp
|
||||||
Jet_fitting_3/examples/Jet_fitting_3/*.exe
|
Jet_fitting_3/examples/Jet_fitting_3/*.exe
|
||||||
Jet_fitting_3/examples/Jet_fitting_3/*.sln
|
Jet_fitting_3/examples/Jet_fitting_3/*.sln
|
||||||
Jet_fitting_3/examples/Jet_fitting_3/*.vcproj
|
Jet_fitting_3/examples/Jet_fitting_3/*.vcproj
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,8 @@
|
||||||
# CGAL_TAUCS_LIBRARIES_DIR -list of folders (using full path name) containing
|
# CGAL_TAUCS_LIBRARIES_DIR -list of folders (using full path name) containing
|
||||||
# TAUCS (and optionaly BLAS and LAPACK) libraries
|
# TAUCS (and optionaly BLAS and LAPACK) libraries
|
||||||
|
|
||||||
|
include(CGAL_Macros)
|
||||||
|
|
||||||
if ( NOT CGAL_TAUCS_FOUND )
|
if ( NOT CGAL_TAUCS_FOUND )
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,8 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
|
||||||
if ( "${${VAR}}" STREQUAL "" )
|
if ( "${${VAR}}" STREQUAL "" )
|
||||||
set( ${VAR}_env_value "$ENV{${VAR}}" )
|
set( ${VAR}_env_value "$ENV{${VAR}}" )
|
||||||
if ( NOT "${${VAR}_env_value}" STREQUAL "" )
|
if ( NOT "${${VAR}_env_value}" STREQUAL "" )
|
||||||
set( ${VAR} ${${VAR}_env_value} )
|
# Convert Windows path to Unix-style
|
||||||
|
FILE(TO_CMAKE_PATH ${${VAR}_env_value} ${VAR})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@
|
||||||
include(CheckFunctionExists)
|
include(CheckFunctionExists)
|
||||||
|
|
||||||
include(CGAL_GeneratorSpecificSettings)
|
include(CGAL_GeneratorSpecificSettings)
|
||||||
|
include(CGAL_Macros)
|
||||||
|
|
||||||
|
|
||||||
# This macro checks for the existence of the combination of fortran libraries
|
# This macro checks for the existence of the combination of fortran libraries
|
||||||
|
|
@ -80,6 +81,7 @@ macro(check_fortran_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _
|
||||||
PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
|
PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
#message("DEBUG: find_library(${_library}) = ${${_prefix}_${_library}_LIBRARY}")
|
||||||
mark_as_advanced(${_prefix}_${_library}_LIBRARY)
|
mark_as_advanced(${_prefix}_${_library}_LIBRARY)
|
||||||
set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
|
set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
|
||||||
set(_libraries_found ${${_prefix}_${_library}_LIBRARY})
|
set(_libraries_found ${${_prefix}_${_library}_LIBRARY})
|
||||||
|
|
@ -107,6 +109,7 @@ macro(check_fortran_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _
|
||||||
#message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
|
#message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
|
||||||
# Check if function exists with f2c calling convention (ie a trailing underscore)
|
# Check if function exists with f2c calling convention (ie a trailing underscore)
|
||||||
check_function_exists(${_name}_ ${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
|
check_function_exists(${_name}_ ${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
|
||||||
|
#message("DEBUG: check_function_exists(${_name}_) = ${${_prefix}_${_name}_${_combined_name}_f2c_WORKS}")
|
||||||
set(CMAKE_REQUIRED_DEFINITIONS} "")
|
set(CMAKE_REQUIRED_DEFINITIONS} "")
|
||||||
set(CMAKE_REQUIRED_LIBRARIES "")
|
set(CMAKE_REQUIRED_LIBRARIES "")
|
||||||
mark_as_advanced(${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
|
mark_as_advanced(${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
|
||||||
|
|
@ -122,6 +125,7 @@ macro(check_fortran_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _
|
||||||
set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}})
|
set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}})
|
||||||
#message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
|
#message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
|
||||||
check_function_exists(${_name} ${_prefix}_${_name}${_combined_name}_WORKS)
|
check_function_exists(${_name} ${_prefix}_${_name}${_combined_name}_WORKS)
|
||||||
|
#message("DEBUG: check_function_exists(${_name}) = ${${_prefix}_${_name}${_combined_name}_WORKS}")
|
||||||
set(CMAKE_REQUIRED_LIBRARIES "")
|
set(CMAKE_REQUIRED_LIBRARIES "")
|
||||||
mark_as_advanced(${_prefix}_${_name}${_combined_name}_WORKS)
|
mark_as_advanced(${_prefix}_${_name}${_combined_name}_WORKS)
|
||||||
set(_libraries_work ${${_prefix}_${_name}${_combined_name}_WORKS})
|
set(_libraries_work ${${_prefix}_${_name}${_combined_name}_WORKS})
|
||||||
|
|
@ -159,20 +163,25 @@ else()
|
||||||
# Set CGAL_TAUCS_FOUND, CGAL_TAUCS_INCLUDE_DIR and CGAL_TAUCS_LIBRARIES_DIR.
|
# Set CGAL_TAUCS_FOUND, CGAL_TAUCS_INCLUDE_DIR and CGAL_TAUCS_LIBRARIES_DIR.
|
||||||
include(CGAL_Locate_CGAL_TAUCS)
|
include(CGAL_Locate_CGAL_TAUCS)
|
||||||
|
|
||||||
# Search for BLAS in CGAL_TAUCS_INCLUDE_DIR/CGAL_TAUCS_LIBRARIES_DIR (TAUCS shipped with CGAL),
|
# Search for BLAS in CGAL_TAUCS_INCLUDE_DIR/CGAL_TAUCS_LIBRARIES_DIR (TAUCS shipped with CGAL)...
|
||||||
# else in $BLAS_INC_DIR/$BLAS_LIB_DIR environment variables.
|
|
||||||
if(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED)
|
if(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED)
|
||||||
|
|
||||||
# if VC++: done
|
# if VC++: done
|
||||||
set( BLAS_INCLUDE_DIR "${CGAL_TAUCS_INCLUDE_DIR}" )
|
set( BLAS_INCLUDE_DIR "${CGAL_TAUCS_INCLUDE_DIR}" )
|
||||||
set( BLAS_LIBRARIES_DIR "${CGAL_TAUCS_LIBRARIES_DIR}" )
|
set( BLAS_LIBRARIES_DIR "${CGAL_TAUCS_LIBRARIES_DIR}" )
|
||||||
|
|
||||||
|
# ...else search for BLAS in $BLAS_LIB_DIR environment variable
|
||||||
else(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED)
|
else(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED)
|
||||||
|
|
||||||
#
|
#
|
||||||
# If Unix, search for BLAS function in possible libraries
|
# Search for BLAS in possible libraries
|
||||||
|
# in $BLAS_LIB_DIR environment variable and in usual places.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# Read environment variables
|
||||||
|
fetch_env_var(BLAS_LIB_DIR)
|
||||||
|
fetch_env_var(MKL_LIB_DIR)
|
||||||
|
|
||||||
# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
|
# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
|
||||||
if(NOT BLAS_LIBRARIES)
|
if(NOT BLAS_LIBRARIES)
|
||||||
check_fortran_libraries(
|
check_fortran_libraries(
|
||||||
|
|
@ -182,7 +191,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"cblas;f77blas;atlas"
|
"cblas;f77blas;atlas"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -195,7 +204,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"sgemm;dgemm;blas"
|
"sgemm;dgemm;blas"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -208,7 +217,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"cxml"
|
"cxml"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -221,7 +230,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"dxml"
|
"dxml"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -234,7 +243,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
"-xlic_lib=sunperf"
|
"-xlic_lib=sunperf"
|
||||||
"sunperf;sunmath"
|
"sunperf;sunmath"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
if(BLAS_LIBRARIES)
|
if(BLAS_LIBRARIES)
|
||||||
# Extra linker flag
|
# Extra linker flag
|
||||||
|
|
@ -251,7 +260,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"scsl"
|
"scsl"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -264,7 +273,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"complib.sgimath"
|
"complib.sgimath"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -277,24 +286,14 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"essl;blas"
|
"essl;blas"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#BLAS in intel mkl 10 library? (em64t 64bit)
|
# intel mkl 10 library?
|
||||||
if(NOT BLAS_LIBRARIES)
|
# TODO: add shared variants
|
||||||
check_fortran_libraries(
|
if (WIN32)
|
||||||
BLAS_DEFINITIONS
|
# intel mkl library? (static, 32bit)
|
||||||
BLAS_LIBRARIES
|
|
||||||
BLAS
|
|
||||||
sgemm
|
|
||||||
""
|
|
||||||
"mkl_intel_lp64;mkl_intel_thread;mkl_core;guide;pthread"
|
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
### windows version of intel mkl 10?
|
|
||||||
if(NOT BLAS_LIBRARIES)
|
if(NOT BLAS_LIBRARIES)
|
||||||
check_fortran_libraries(
|
check_fortran_libraries(
|
||||||
BLAS_DEFINITIONS
|
BLAS_DEFINITIONS
|
||||||
|
|
@ -302,14 +301,54 @@ else()
|
||||||
BLAS
|
BLAS
|
||||||
SGEMM
|
SGEMM
|
||||||
""
|
""
|
||||||
"mkl_c_dll;mkl_intel_thread_dll;mkl_core_dll;libguide40"
|
"mkl_intel_c;mkl_intel_thread;mkl_core;libiomp5md"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${MKL_LIB_DIR} ${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#older versions of intel mkl libs
|
# intel mkl library? (static, ia64 and em64t 64 bit)
|
||||||
|
if(NOT BLAS_LIBRARIES)
|
||||||
|
check_fortran_libraries(
|
||||||
|
BLAS_DEFINITIONS
|
||||||
|
BLAS_LIBRARIES
|
||||||
|
BLAS
|
||||||
|
SGEMM
|
||||||
|
""
|
||||||
|
"mkl_intel_lp64;mkl_intel_thread_lp64;mkl_core;libiomp5md"
|
||||||
|
"${MKL_LIB_DIR} ${BLAS_LIB_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
else(WIN32)
|
||||||
|
# intel mkl library? (static, 32bit)
|
||||||
|
if(NOT BLAS_LIBRARIES)
|
||||||
|
check_fortran_libraries(
|
||||||
|
BLAS_DEFINITIONS
|
||||||
|
BLAS_LIBRARIES
|
||||||
|
BLAS
|
||||||
|
sgemm
|
||||||
|
""
|
||||||
|
"mkl_intel;mkl_intel_thread;mkl_core;libiomp5;pthread"
|
||||||
|
"${MKL_LIB_DIR} ${BLAS_LIB_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
# BLAS in intel mkl library? (shared)
|
# intel mkl library? (static, ia64 and em64t 64 bit)
|
||||||
|
if(NOT BLAS_LIBRARIES)
|
||||||
|
check_fortran_libraries(
|
||||||
|
BLAS_DEFINITIONS
|
||||||
|
BLAS_LIBRARIES
|
||||||
|
BLAS
|
||||||
|
sgemm
|
||||||
|
""
|
||||||
|
"mkl_intel_lp64;mkl_intel_thread_lp64;mkl_core;libiomp5;pthread"
|
||||||
|
"${MKL_LIB_DIR} ${BLAS_LIB_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif (WIN32)
|
||||||
|
|
||||||
|
# older versions of intel mkl libs
|
||||||
|
|
||||||
|
# intel mkl library? (shared)
|
||||||
if(NOT BLAS_LIBRARIES)
|
if(NOT BLAS_LIBRARIES)
|
||||||
check_fortran_libraries(
|
check_fortran_libraries(
|
||||||
BLAS_DEFINITIONS
|
BLAS_DEFINITIONS
|
||||||
|
|
@ -318,11 +357,11 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"mkl;guide;pthread"
|
"mkl;guide;pthread"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${MKL_LIB_DIR} ${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#BLAS in intel mkl library? (static, 32bit)
|
# intel mkl library? (static, 32bit)
|
||||||
if(NOT BLAS_LIBRARIES)
|
if(NOT BLAS_LIBRARIES)
|
||||||
check_fortran_libraries(
|
check_fortran_libraries(
|
||||||
BLAS_DEFINITIONS
|
BLAS_DEFINITIONS
|
||||||
|
|
@ -331,11 +370,24 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"mkl_ia32;guide;pthread"
|
"mkl_ia32;guide;pthread"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${MKL_LIB_DIR} ${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
#BLAS in intel mkl library? (static, em64t 64bit)
|
# intel mkl library? (static, ia64 64bit)
|
||||||
|
if(NOT BLAS_LIBRARIES)
|
||||||
|
check_fortran_libraries(
|
||||||
|
BLAS_DEFINITIONS
|
||||||
|
BLAS_LIBRARIES
|
||||||
|
BLAS
|
||||||
|
sgemm
|
||||||
|
""
|
||||||
|
"mkl_ipf;guide;pthread"
|
||||||
|
"${MKL_LIB_DIR} ${BLAS_LIB_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# intel mkl library? (static, em64t 64bit)
|
||||||
if(NOT BLAS_LIBRARIES)
|
if(NOT BLAS_LIBRARIES)
|
||||||
check_fortran_libraries(
|
check_fortran_libraries(
|
||||||
BLAS_DEFINITIONS
|
BLAS_DEFINITIONS
|
||||||
|
|
@ -344,7 +396,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"mkl_em64t;guide;pthread"
|
"mkl_em64t;guide;pthread"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${MKL_LIB_DIR} ${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -357,7 +409,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"acml"
|
"acml"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -370,7 +422,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"Accelerate"
|
"Accelerate"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -382,7 +434,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"vecLib"
|
"vecLib"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif ( NOT BLAS_LIBRARIES )
|
endif ( NOT BLAS_LIBRARIES )
|
||||||
|
|
||||||
|
|
@ -396,7 +448,7 @@ else()
|
||||||
sgemm
|
sgemm
|
||||||
""
|
""
|
||||||
"blas"
|
"blas"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV BLAS_LIB_DIR"
|
"${BLAS_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@
|
||||||
include(CheckFunctionExists)
|
include(CheckFunctionExists)
|
||||||
|
|
||||||
include(CGAL_GeneratorSpecificSettings)
|
include(CGAL_GeneratorSpecificSettings)
|
||||||
|
include(CGAL_Macros)
|
||||||
|
|
||||||
|
|
||||||
# This macro checks for the existence of the combination of fortran libraries
|
# This macro checks for the existence of the combination of fortran libraries
|
||||||
|
|
@ -79,6 +80,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
|
||||||
PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
|
PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
#message("DEBUG: find_library(${_library}) = ${${_prefix}_${_library}_LIBRARY}")
|
||||||
mark_as_advanced(${_prefix}_${_library}_LIBRARY)
|
mark_as_advanced(${_prefix}_${_library}_LIBRARY)
|
||||||
set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
|
set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
|
||||||
set(_libraries_found ${${_prefix}_${_library}_LIBRARY})
|
set(_libraries_found ${${_prefix}_${_library}_LIBRARY})
|
||||||
|
|
@ -106,6 +108,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
|
||||||
#message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
|
#message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
|
||||||
# Check if function exists with f2c calling convention (ie a trailing underscore)
|
# Check if function exists with f2c calling convention (ie a trailing underscore)
|
||||||
check_function_exists(${_name}_ ${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
|
check_function_exists(${_name}_ ${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
|
||||||
|
#message("DEBUG: check_function_exists(${_name}_) = ${${_prefix}_${_name}_${_combined_name}_f2c_WORKS}")
|
||||||
set(CMAKE_REQUIRED_DEFINITIONS} "")
|
set(CMAKE_REQUIRED_DEFINITIONS} "")
|
||||||
set(CMAKE_REQUIRED_LIBRARIES "")
|
set(CMAKE_REQUIRED_LIBRARIES "")
|
||||||
mark_as_advanced(${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
|
mark_as_advanced(${_prefix}_${_name}_${_combined_name}_f2c_WORKS)
|
||||||
|
|
@ -121,6 +124,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
|
||||||
set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas})
|
set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}} ${_blas})
|
||||||
#message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
|
#message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
|
||||||
check_function_exists(${_name} ${_prefix}_${_name}${_combined_name}_WORKS)
|
check_function_exists(${_name} ${_prefix}_${_name}${_combined_name}_WORKS)
|
||||||
|
#message("DEBUG: check_function_exists(${_name}) = ${${_prefix}_${_name}${_combined_name}_WORKS}")
|
||||||
set(CMAKE_REQUIRED_LIBRARIES "")
|
set(CMAKE_REQUIRED_LIBRARIES "")
|
||||||
mark_as_advanced(${_prefix}_${_name}${_combined_name}_WORKS)
|
mark_as_advanced(${_prefix}_${_name}${_combined_name}_WORKS)
|
||||||
set(_libraries_work ${${_prefix}_${_name}${_combined_name}_WORKS})
|
set(_libraries_work ${${_prefix}_${_name}${_combined_name}_WORKS})
|
||||||
|
|
@ -170,21 +174,40 @@ else()
|
||||||
# Set CGAL_TAUCS_FOUND, CGAL_TAUCS_INCLUDE_DIR and CGAL_TAUCS_LIBRARIES_DIR.
|
# Set CGAL_TAUCS_FOUND, CGAL_TAUCS_INCLUDE_DIR and CGAL_TAUCS_LIBRARIES_DIR.
|
||||||
include(CGAL_Locate_CGAL_TAUCS)
|
include(CGAL_Locate_CGAL_TAUCS)
|
||||||
|
|
||||||
# Search for LAPACK in CGAL_TAUCS_INCLUDE_DIR/CGAL_TAUCS_LIBRARIES_DIR (TAUCS shipped with CGAL),
|
# Search for LAPACK in CGAL_TAUCS_INCLUDE_DIR/CGAL_TAUCS_LIBRARIES_DIR (TAUCS shipped with CGAL)...
|
||||||
# else in $LAPACK_INC_DIR/$LAPACK_LIB_DIR environment variables.
|
|
||||||
if(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED)
|
if(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED)
|
||||||
|
|
||||||
# if VC++: done
|
# if VC++: done
|
||||||
set( LAPACK_INCLUDE_DIR "${CGAL_TAUCS_INCLUDE_DIR}" )
|
set( LAPACK_INCLUDE_DIR "${CGAL_TAUCS_INCLUDE_DIR}" )
|
||||||
set( LAPACK_LIBRARIES_DIR "${CGAL_TAUCS_LIBRARIES_DIR}" )
|
set( LAPACK_LIBRARIES_DIR "${CGAL_TAUCS_LIBRARIES_DIR}" )
|
||||||
|
|
||||||
|
# ...else in $LAPACK_LIB_DIR environment variable
|
||||||
else(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED)
|
else(CGAL_TAUCS_FOUND AND CGAL_AUTO_LINK_ENABLED)
|
||||||
|
|
||||||
#
|
#
|
||||||
# If Unix, search for LAPACK function in possible libraries
|
# Search for LAPACK in possible libraries
|
||||||
|
# in $LAPACK_LIB_DIR environment variable and in usual places.
|
||||||
#
|
#
|
||||||
|
|
||||||
#intel mkl lapack?
|
# Read environment variables
|
||||||
|
fetch_env_var(LAPACK_LIB_DIR)
|
||||||
|
fetch_env_var(MKL_LIB_DIR)
|
||||||
|
|
||||||
|
#intel mkl 10 lapack?
|
||||||
|
if(NOT LAPACK_LIBRARIES)
|
||||||
|
check_lapack_libraries(
|
||||||
|
LAPACK_DEFINITIONS
|
||||||
|
LAPACK_LIBRARIES
|
||||||
|
LAPACK
|
||||||
|
cheev
|
||||||
|
""
|
||||||
|
"mkl_core"
|
||||||
|
"${BLAS_LIBRARIES}"
|
||||||
|
"${MKL_LIB_DIR} ${LAPACK_LIB_DIR}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# older versions of intel mkl lapack?
|
||||||
if(NOT LAPACK_LIBRARIES)
|
if(NOT LAPACK_LIBRARIES)
|
||||||
check_lapack_libraries(
|
check_lapack_libraries(
|
||||||
LAPACK_DEFINITIONS
|
LAPACK_DEFINITIONS
|
||||||
|
|
@ -194,10 +217,11 @@ else()
|
||||||
""
|
""
|
||||||
"mkl_lapack"
|
"mkl_lapack"
|
||||||
"${BLAS_LIBRARIES}"
|
"${BLAS_LIBRARIES}"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV LAPACK_LIB_DIR"
|
"${MKL_LIB_DIR} ${LAPACK_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
#acml lapack?
|
#acml lapack?
|
||||||
if(NOT LAPACK_LIBRARIES)
|
if(NOT LAPACK_LIBRARIES)
|
||||||
check_lapack_libraries(
|
check_lapack_libraries(
|
||||||
|
|
@ -208,7 +232,7 @@ else()
|
||||||
""
|
""
|
||||||
"acml"
|
"acml"
|
||||||
"${BLAS_LIBRARIES}"
|
"${BLAS_LIBRARIES}"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV LAPACK_LIB_DIR"
|
"${LAPACK_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -222,7 +246,7 @@ else()
|
||||||
""
|
""
|
||||||
"Accelerate"
|
"Accelerate"
|
||||||
"${BLAS_LIBRARIES}"
|
"${BLAS_LIBRARIES}"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV LAPACK_LIB_DIR"
|
"${LAPACK_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -235,7 +259,7 @@ else()
|
||||||
""
|
""
|
||||||
"vecLib"
|
"vecLib"
|
||||||
"${BLAS_LIBRARIES}"
|
"${BLAS_LIBRARIES}"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV LAPACK_LIB_DIR"
|
"${LAPACK_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif ( NOT LAPACK_LIBRARIES )
|
endif ( NOT LAPACK_LIBRARIES )
|
||||||
|
|
||||||
|
|
@ -250,7 +274,7 @@ else()
|
||||||
""
|
""
|
||||||
"lapack"
|
"lapack"
|
||||||
"${BLAS_LIBRARIES}"
|
"${BLAS_LIBRARIES}"
|
||||||
"${CGAL_TAUCS_LIBRARIES_DIR} ENV LAPACK_LIB_DIR"
|
"${LAPACK_LIB_DIR}"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue