mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Merged latest updates from trunk
This commit is contained in:
@@ -440,6 +440,8 @@ macro(ei_get_compilerver_from_cxx_version_string VERSTRING CNAME CVER)
|
||||
set(${CNAME} "llvm-g++")
|
||||
elseif((ei_has_llvm) AND (ei_has_clang))
|
||||
set(${CNAME} "llvm-clang++")
|
||||
elseif(ei_has_clang)
|
||||
set(${CNAME} "clang++")
|
||||
elseif(ei_has_icpc)
|
||||
set(${CNAME} "icpc")
|
||||
elseif(ei_has_gpp OR ei_has_gcc)
|
||||
|
||||
@@ -66,16 +66,23 @@ if (EIGEN3_INCLUDE_DIR)
|
||||
set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
|
||||
|
||||
else (EIGEN3_INCLUDE_DIR)
|
||||
|
||||
# search first if an Eigen3Config.cmake is available in the system,
|
||||
# if successful this would set EIGEN3_INCLUDE_DIR and the rest of
|
||||
# the script will work as usual
|
||||
find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET)
|
||||
|
||||
find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
|
||||
HINTS
|
||||
ENV EIGEN3_ROOT
|
||||
ENV EIGEN3_ROOT_DIR
|
||||
PATHS
|
||||
${CMAKE_INSTALL_PREFIX}/include
|
||||
${KDE4_INCLUDE_DIR}
|
||||
PATH_SUFFIXES eigen3 eigen
|
||||
)
|
||||
if(NOT EIGEN3_INCLUDE_DIR)
|
||||
find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
|
||||
HINTS
|
||||
ENV EIGEN3_ROOT
|
||||
ENV EIGEN3_ROOT_DIR
|
||||
PATHS
|
||||
${CMAKE_INSTALL_PREFIX}/include
|
||||
${KDE4_INCLUDE_DIR}
|
||||
PATH_SUFFIXES eigen3 eigen
|
||||
)
|
||||
endif(NOT EIGEN3_INCLUDE_DIR)
|
||||
|
||||
if(EIGEN3_INCLUDE_DIR)
|
||||
_eigen3_check_version()
|
||||
|
||||
@@ -17,7 +17,10 @@ find_path(SUPERLU_INCLUDES
|
||||
SRC
|
||||
)
|
||||
|
||||
find_library(SUPERLU_LIBRARIES NAMES "superlu_4.3" "superlu_4.2" "superlu_4.1" "superlu_4.0" "superlu_3.1" "superlu_3.0" "superlu" PATHS $ENV{SUPERLUDIR} ${LIB_INSTALL_DIR} PATH_SUFFIXES lib)
|
||||
find_library(SUPERLU_LIBRARIES
|
||||
NAMES "superlu_5.2.1" "superlu_5.2" "superlu_5.1.1" "superlu_5.1" "superlu_5.0" "superlu_4.3" "superlu_4.2" "superlu_4.1" "superlu_4.0" "superlu_3.1" "superlu_3.0" "superlu"
|
||||
PATHS $ENV{SUPERLUDIR} ${LIB_INSTALL_DIR}
|
||||
PATH_SUFFIXES lib)
|
||||
|
||||
if(SUPERLU_INCLUDES AND SUPERLU_LIBRARIES)
|
||||
|
||||
@@ -48,11 +51,25 @@ int main() {
|
||||
}"
|
||||
SUPERLU_HAS_CLEAN_ENUMS)
|
||||
|
||||
if(SUPERLU_HAS_CLEAN_ENUMS)
|
||||
check_cxx_source_compiles("
|
||||
typedef int int_t;
|
||||
#include <supermatrix.h>
|
||||
#include <slu_util.h>
|
||||
int main(void)
|
||||
{
|
||||
GlobalLU_t glu;
|
||||
return 0;
|
||||
}"
|
||||
SUPERLU_HAS_GLOBALLU_T)
|
||||
|
||||
if(SUPERLU_HAS_GLOBALLU_T)
|
||||
# at least 5.0
|
||||
set(SUPERLU_VERSION_VAR "5.0")
|
||||
elseif(SUPERLU_HAS_CLEAN_ENUMS)
|
||||
# at least 4.3
|
||||
set(SUPERLU_VERSION_VAR "4.3")
|
||||
elseif(SUPERLU_HAS_GLOBAL_MEM_USAGE_T)
|
||||
# at least 4.3
|
||||
# at least 4.0
|
||||
set(SUPERLU_VERSION_VAR "4.0")
|
||||
else()
|
||||
set(SUPERLU_VERSION_VAR "3.0")
|
||||
|
||||
Reference in New Issue
Block a user