GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

STYLE: Remove CMake-language block-end command arguments

Browse Source 
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the block.
This is no longer the preferred style.
This commit is contained in:
Hans Johnson 2019-10-31 11:36:27 -05:00
parent f1e8307308
commit 6fb3e5f176
59 changed files with 253 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CMakeLists.txt
View File

@ -54,13 +54,13 @@ endif()
if(EIGEN_BRANCH_OUTPUT MATCHES "default") if(EIGEN_BRANCH_OUTPUT MATCHES "default")
string(REGEX MATCH "^changeset: *[0-9]*:([0-9;a-f]+).*" EIGEN_HG_CHANGESET_MATCH "${EIGEN_HGTIP_OUTPUT}") string(REGEX MATCH "^changeset: *[0-9]*:([0-9;a-f]+).*" EIGEN_HG_CHANGESET_MATCH "${EIGEN_HGTIP_OUTPUT}")
set(EIGEN_HG_CHANGESET "${CMAKE_MATCH_1}") set(EIGEN_HG_CHANGESET "${CMAKE_MATCH_1}")
endif(EIGEN_BRANCH_OUTPUT MATCHES "default") endif()
#...and show it next to the version number #...and show it next to the version number
if(EIGEN_HG_CHANGESET) if(EIGEN_HG_CHANGESET)
set(EIGEN_VERSION "${EIGEN_VERSION_NUMBER} (mercurial changeset ${EIGEN_HG_CHANGESET})") set(EIGEN_VERSION "${EIGEN_VERSION_NUMBER} (mercurial changeset ${EIGEN_HG_CHANGESET})")
else(EIGEN_HG_CHANGESET) else()
set(EIGEN_VERSION "${EIGEN_VERSION_NUMBER}") set(EIGEN_VERSION "${EIGEN_VERSION_NUMBER}")
endif(EIGEN_HG_CHANGESET) endif()
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
@ -79,7 +79,7 @@ macro(ei_add_cxx_compiler_flag FLAG)
if(COMPILER_SUPPORT_${SFLAG}) if(COMPILER_SUPPORT_${SFLAG})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}")
endif() endif()
endmacro(ei_add_cxx_compiler_flag) endmacro()
check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11) check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11)
@ -319,7 +319,7 @@ if(NOT MSVC)
endif() endif()
endif() endif()
else(NOT MSVC) else()
# C4127 - conditional expression is constant # C4127 - conditional expression is constant
# C4714 - marked as __forceinline not inlined (I failed to deactivate it selectively) # C4714 - marked as __forceinline not inlined (I failed to deactivate it selectively)
@ -347,9 +347,9 @@ else(NOT MSVC)
if(NOT CMAKE_CL_64) if(NOT CMAKE_CL_64)
# arch is not supported on 64 bit systems, SSE is enabled automatically. # arch is not supported on 64 bit systems, SSE is enabled automatically.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2")
endif(NOT CMAKE_CL_64) endif()
message(STATUS "Enabling SSE2 in tests/examples") message(STATUS "Enabling SSE2 in tests/examples")
endif(EIGEN_TEST_SSE2) endif()
option(EIGEN_TEST_AVX "Enable/Disable AVX in tests/examples" OFF) option(EIGEN_TEST_AVX "Enable/Disable AVX in tests/examples" OFF)
if(EIGEN_TEST_AVX) if(EIGEN_TEST_AVX)
@ -363,7 +363,7 @@ else(NOT MSVC)
message(STATUS "Enabling FMA/AVX2 in tests/examples") message(STATUS "Enabling FMA/AVX2 in tests/examples")
endif() endif()
endif(NOT MSVC) endif()
option(EIGEN_TEST_NO_EXPLICIT_VECTORIZATION "Disable explicit vectorization in tests/examples" OFF) option(EIGEN_TEST_NO_EXPLICIT_VECTORIZATION "Disable explicit vectorization in tests/examples" OFF)
option(EIGEN_TEST_X87 "Force using X87 instructions. Implies no vectorization." OFF) option(EIGEN_TEST_X87 "Force using X87 instructions. Implies no vectorization." OFF)
@ -440,9 +440,9 @@ macro(ei_add_target_property target prop value)
# if the property wasn't previously set, ${previous} is now "previous-NOTFOUND" which cmake allows catching with plain if() # if the property wasn't previously set, ${previous} is now "previous-NOTFOUND" which cmake allows catching with plain if()
if(NOT previous) if(NOT previous)
set(previous "") set(previous "")
endif(NOT previous) endif()
set_target_properties(${target} PROPERTIES ${prop} "${previous} ${value}") set_target_properties(${target} PROPERTIES ${prop} "${previous} ${value}")
endmacro(ei_add_target_property) endmacro()
install(FILES install(FILES
signature_of_eigen3_matrix_library signature_of_eigen3_matrix_library
@ -489,11 +489,11 @@ if(EIGEN_TEST_SYCL)
if(EIGEN_SYCL_TRISYCL) if(EIGEN_SYCL_TRISYCL)
message(STATUS "Using triSYCL") message(STATUS "Using triSYCL")
include(FindTriSYCL) include(FindTriSYCL)
else(EIGEN_SYCL_TRISYCL) else()
message(STATUS "Using ComputeCPP SYCL") message(STATUS "Using ComputeCPP SYCL")
include(FindComputeCpp) include(FindComputeCpp)
endif(EIGEN_SYCL_TRISYCL) endif()
endif(EIGEN_TEST_SYCL) endif()
add_subdirectory(unsupported) add_subdirectory(unsupported)
@ -505,11 +505,11 @@ add_subdirectory(scripts EXCLUDE_FROM_ALL)
# TODO: consider also replacing EIGEN_BUILD_BTL by a custom target "make btl"? # TODO: consider also replacing EIGEN_BUILD_BTL by a custom target "make btl"?
if(EIGEN_BUILD_BTL) if(EIGEN_BUILD_BTL)
add_subdirectory(bench/btl EXCLUDE_FROM_ALL) add_subdirectory(bench/btl EXCLUDE_FROM_ALL)
endif(EIGEN_BUILD_BTL) endif()
if(NOT WIN32) if(NOT WIN32)
add_subdirectory(bench/spbench EXCLUDE_FROM_ALL) add_subdirectory(bench/spbench EXCLUDE_FROM_ALL)
endif(NOT WIN32) endif()
configure_file(scripts/cdashtesting.cmake.in cdashtesting.cmake @ONLY) configure_file(scripts/cdashtesting.cmake.in cdashtesting.cmake @ONLY)
@ -605,7 +605,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 3.0)
install (EXPORT Eigen3Targets NAMESPACE Eigen3:: DESTINATION ${CMAKEPACKAGE_INSTALL_DIR}) install (EXPORT Eigen3Targets NAMESPACE Eigen3:: DESTINATION ${CMAKEPACKAGE_INSTALL_DIR})
else (NOT CMAKE_VERSION VERSION_LESS 3.0) else ()
# Fallback to legacy Eigen3Config.cmake without the imported target # Fallback to legacy Eigen3Config.cmake without the imported target
# If CMakePackageConfigHelpers module is available (CMake >= 2.8.8) # If CMakePackageConfigHelpers module is available (CMake >= 2.8.8)
@ -635,7 +635,7 @@ else (NOT CMAKE_VERSION VERSION_LESS 3.0)
VERSION ${EIGEN_VERSION_NUMBER} VERSION ${EIGEN_VERSION_NUMBER}
COMPATIBILITY SameMajorVersion ) COMPATIBILITY SameMajorVersion )
endif (NOT CMAKE_VERSION VERSION_LESS 3.0) endif ()
install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UseEigen3.cmake install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UseEigen3.cmake
${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/Eigen3Config.cmake

2
Eigen/CMakeLists.txt
View File

@ -9,7 +9,7 @@ foreach(f ${Eigen_directory_files})
if(NOT f MATCHES "\\.txt" AND NOT f MATCHES "${ESCAPED_CMAKE_CURRENT_SOURCE_DIR}/[.].+" AND NOT f MATCHES "${ESCAPED_CMAKE_CURRENT_SOURCE_DIR}/src") if(NOT f MATCHES "\\.txt" AND NOT f MATCHES "${ESCAPED_CMAKE_CURRENT_SOURCE_DIR}/[.].+" AND NOT f MATCHES "${ESCAPED_CMAKE_CURRENT_SOURCE_DIR}/src")
list(APPEND Eigen_directory_files_to_install ${f}) list(APPEND Eigen_directory_files_to_install ${f})
endif() endif()
endforeach(f ${Eigen_directory_files}) endforeach()
install(FILES install(FILES
${Eigen_directory_files_to_install} ${Eigen_directory_files_to_install}

10
bench/btl/CMakeLists.txt
View File

@ -29,7 +29,7 @@ ENDIF(MSVC)
if(IS_ICPC) if(IS_ICPC)
set(CMAKE_CXX_FLAGS "-fast ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "-fast ${CMAKE_CXX_FLAGS}")
set(CMAKE_Fortran_FLAGS "-fast ${CMAKE_Fortran_FLAGS}") set(CMAKE_Fortran_FLAGS "-fast ${CMAKE_Fortran_FLAGS}")
endif(IS_ICPC) endif()
include_directories( include_directories(
${PROJECT_SOURCE_DIR}/actions ${PROJECT_SOURCE_DIR}/actions
@ -41,7 +41,7 @@ include_directories(
# if (MKL_FOUND) # if (MKL_FOUND)
# add_definitions(-DHAVE_MKL) # add_definitions(-DHAVE_MKL)
# set(DEFAULT_LIBRARIES ${MKL_LIBRARIES}) # set(DEFAULT_LIBRARIES ${MKL_LIBRARIES})
# endif (MKL_FOUND) # endif ()
find_library(EIGEN_BTL_RT_LIBRARY rt) find_library(EIGEN_BTL_RT_LIBRARY rt)
# if we cannot find it easily, then we don't need it! # if we cannot find it easily, then we don't need it!
@ -53,7 +53,7 @@ MACRO(BTL_ADD_BENCH targetname)
foreach(_current_var ${ARGN}) foreach(_current_var ${ARGN})
set(_last_var ${_current_var}) set(_last_var ${_current_var})
endforeach(_current_var) endforeach()
set(_sources ${ARGN}) set(_sources ${ARGN})
list(LENGTH _sources _argn_length) list(LENGTH _sources _argn_length)
@ -64,7 +64,7 @@ MACRO(BTL_ADD_BENCH targetname)
if (${_argn_length} EQUAL ${_src_length}) if (${_argn_length} EQUAL ${_src_length})
set(_last_var ON) set(_last_var ON)
endif (${_argn_length} EQUAL ${_src_length}) endif ()
OPTION(BUILD_${targetname} "Build benchmark ${targetname}" ${_last_var}) OPTION(BUILD_${targetname} "Build benchmark ${targetname}" ${_last_var})
@ -86,7 +86,7 @@ macro(btl_add_target_property target prop value)
set_target_properties(${target} PROPERTIES ${prop} "${previous} ${value}") set_target_properties(${target} PROPERTIES ${prop} "${previous} ${value}")
endif() endif()
endmacro(btl_add_target_property) endmacro()
ENABLE_TESTING() ENABLE_TESTING()

2
bench/btl/cmake/FindACML.cmake
View File

@ -1,7 +1,7 @@
if (ACML_LIBRARIES) if (ACML_LIBRARIES)
set(ACML_FIND_QUIETLY TRUE) set(ACML_FIND_QUIETLY TRUE)
endif (ACML_LIBRARIES) endif ()
find_library(ACML_LIBRARIES find_library(ACML_LIBRARIES
NAMES NAMES

4
bench/btl/cmake/FindATLAS.cmake
View File

@ -1,7 +1,7 @@
if (ATLAS_LIBRARIES) if (ATLAS_LIBRARIES)
set(ATLAS_FIND_QUIETLY TRUE) set(ATLAS_FIND_QUIETLY TRUE)
endif (ATLAS_LIBRARIES) endif ()
find_file(ATLAS_LIB libatlas.so.3 PATHS /usr/lib /usr/lib/atlas /usr/lib64 /usr/lib64/atlas $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) find_file(ATLAS_LIB libatlas.so.3 PATHS /usr/lib /usr/lib/atlas /usr/lib64 /usr/lib64/atlas $ENV{ATLASDIR} ${LIB_INSTALL_DIR})
find_library(ATLAS_LIB satlas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR}) find_library(ATLAS_LIB satlas PATHS $ENV{ATLASDIR} ${LIB_INSTALL_DIR})
@ -23,7 +23,7 @@ if(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS)
# set(ATLAS_LIBRARIES ${ATLAS_LIBRARIES} ${ATLAS_REFERENCE_LAPACK}) # set(ATLAS_LIBRARIES ${ATLAS_LIBRARIES} ${ATLAS_REFERENCE_LAPACK})
# endif() # endif()
endif(ATLAS_LIB AND ATLAS_CBLAS AND ATLAS_LAPACK AND ATLAS_F77BLAS) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ATLAS DEFAULT_MSG ATLAS_LIBRARIES) find_package_handle_standard_args(ATLAS DEFAULT_MSG ATLAS_LIBRARIES)

4
bench/btl/cmake/FindBLAZE.cmake
View File

@ -15,7 +15,7 @@ if (BLAZE_INCLUDE_DIR)
# in cache already # in cache already
set(BLAZE_FOUND TRUE) set(BLAZE_FOUND TRUE)
else (BLAZE_INCLUDE_DIR) else ()
find_path(BLAZE_INCLUDE_DIR NAMES blaze/Blaze.h find_path(BLAZE_INCLUDE_DIR NAMES blaze/Blaze.h
PATHS PATHS
@ -27,5 +27,5 @@ find_package_handle_standard_args(BLAZE DEFAULT_MSG BLAZE_INCLUDE_DIR)
mark_as_advanced(BLAZE_INCLUDE_DIR) mark_as_advanced(BLAZE_INCLUDE_DIR)
endif(BLAZE_INCLUDE_DIR) endif()

2
bench/btl/cmake/FindBlitz.cmake
View File

@ -15,7 +15,7 @@
if (BLITZ_INCLUDES AND BLITZ_LIBRARIES) if (BLITZ_INCLUDES AND BLITZ_LIBRARIES)
set(Blitz_FIND_QUIETLY TRUE) set(Blitz_FIND_QUIETLY TRUE)
endif (BLITZ_INCLUDES AND BLITZ_LIBRARIES) endif ()
find_path(BLITZ_INCLUDES find_path(BLITZ_INCLUDES
NAMES NAMES

2
bench/btl/cmake/FindCBLAS.cmake
View File

@ -2,7 +2,7 @@
if (CBLAS_INCLUDES AND CBLAS_LIBRARIES) if (CBLAS_INCLUDES AND CBLAS_LIBRARIES)
set(CBLAS_FIND_QUIETLY TRUE) set(CBLAS_FIND_QUIETLY TRUE)
endif (CBLAS_INCLUDES AND CBLAS_LIBRARIES) endif ()
find_path(CBLAS_INCLUDES find_path(CBLAS_INCLUDES
NAMES NAMES

4
bench/btl/cmake/FindGMM.cmake
View File

@ -1,7 +1,7 @@
if (GMM_INCLUDE_DIR) if (GMM_INCLUDE_DIR)
# in cache already # in cache already
set(GMM_FOUND TRUE) set(GMM_FOUND TRUE)
else (GMM_INCLUDE_DIR) else ()
find_path(GMM_INCLUDE_DIR NAMES gmm/gmm.h find_path(GMM_INCLUDE_DIR NAMES gmm/gmm.h
PATHS PATHS
@ -14,4 +14,4 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMM DEFAULT_MSG GMM_INCLUDE_DIR )
mark_as_advanced(GMM_INCLUDE_DIR) mark_as_advanced(GMM_INCLUDE_DIR)
endif(GMM_INCLUDE_DIR) endif()

8
bench/btl/cmake/FindMKL.cmake
View File

@ -1,7 +1,7 @@
if (MKL_LIBRARIES) if (MKL_LIBRARIES)
set(MKL_FIND_QUIETLY TRUE) set(MKL_FIND_QUIETLY TRUE)
endif (MKL_LIBRARIES) endif ()
if(CMAKE_MINOR_VERSION GREATER 4) if(CMAKE_MINOR_VERSION GREATER 4)
@ -30,7 +30,7 @@ if(MKL_LIBRARIES AND MKL_GUIDE)
set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel_lp64 mkl_sequential ${MKL_GUIDE} pthread) set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel_lp64 mkl_sequential ${MKL_GUIDE} pthread)
endif() endif()
else(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") else()
find_library(MKL_LIBRARIES find_library(MKL_LIBRARIES
mkl_core mkl_core
@ -55,9 +55,9 @@ if(MKL_LIBRARIES AND MKL_GUIDE)
set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel mkl_sequential ${MKL_GUIDE} pthread) set(MKL_LIBRARIES ${MKL_LIBRARIES} mkl_intel mkl_sequential ${MKL_GUIDE} pthread)
endif() endif()
endif(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") endif()
endif(CMAKE_MINOR_VERSION GREATER 4) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(MKL DEFAULT_MSG MKL_LIBRARIES) find_package_handle_standard_args(MKL DEFAULT_MSG MKL_LIBRARIES)

4
bench/btl/cmake/FindMTL4.cmake
View File

@ -15,7 +15,7 @@ if (MTL4_INCLUDE_DIR)
# in cache already # in cache already
set(MTL4_FOUND TRUE) set(MTL4_FOUND TRUE)
else (MTL4_INCLUDE_DIR) else ()
find_path(MTL4_INCLUDE_DIR NAMES boost/numeric/mtl/mtl.hpp find_path(MTL4_INCLUDE_DIR NAMES boost/numeric/mtl/mtl.hpp
PATHS PATHS
@ -27,5 +27,5 @@ find_package_handle_standard_args(MTL4 DEFAULT_MSG MTL4_INCLUDE_DIR)
mark_as_advanced(MTL4_INCLUDE_DIR) mark_as_advanced(MTL4_INCLUDE_DIR)
endif(MTL4_INCLUDE_DIR) endif()

2
bench/btl/cmake/FindOPENBLAS.cmake
View File

@ -1,7 +1,7 @@
if (OPENBLAS_LIBRARIES) if (OPENBLAS_LIBRARIES)
set(OPENBLAS_FIND_QUIETLY TRUE) set(OPENBLAS_FIND_QUIETLY TRUE)
endif (OPENBLAS_LIBRARIES) endif ()
find_file(OPENBLAS_LIBRARIES NAMES libopenblas.so libopenblas.so.0 PATHS /usr/lib /usr/lib64 $ENV{OPENBLASDIR} ${LIB_INSTALL_DIR}) find_file(OPENBLAS_LIBRARIES NAMES libopenblas.so libopenblas.so.0 PATHS /usr/lib /usr/lib64 $ENV{OPENBLASDIR} ${LIB_INSTALL_DIR})
find_library(OPENBLAS_LIBRARIES openblas PATHS $ENV{OPENBLASDIR} ${LIB_INSTALL_DIR}) find_library(OPENBLAS_LIBRARIES openblas PATHS $ENV{OPENBLASDIR} ${LIB_INSTALL_DIR})

4
bench/btl/cmake/FindTvmet.cmake
View File

@ -15,7 +15,7 @@ if (TVMET_INCLUDE_DIR)
# in cache already # in cache already
set(TVMET_FOUND TRUE) set(TVMET_FOUND TRUE)
else (TVMET_INCLUDE_DIR) else ()
find_path(TVMET_INCLUDE_DIR NAMES tvmet/tvmet.h find_path(TVMET_INCLUDE_DIR NAMES tvmet/tvmet.h
PATHS PATHS
@ -28,5 +28,5 @@ 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()

16
bench/btl/libs/BLAS/CMakeLists.txt
View File

@ -5,8 +5,8 @@ if (ATLAS_FOUND)
if(BUILD_btl_atlas) if(BUILD_btl_atlas)
target_link_libraries(btl_atlas ${ATLAS_LIBRARIES}) target_link_libraries(btl_atlas ${ATLAS_LIBRARIES})
set_target_properties(btl_atlas PROPERTIES COMPILE_FLAGS "-DCBLASNAME=ATLAS -DHAS_LAPACK=1") set_target_properties(btl_atlas PROPERTIES COMPILE_FLAGS "-DCBLASNAME=ATLAS -DHAS_LAPACK=1")
endif(BUILD_btl_atlas) endif()
endif (ATLAS_FOUND) endif ()
find_package(MKL) find_package(MKL)
if (MKL_FOUND) if (MKL_FOUND)
@ -14,8 +14,8 @@ if (MKL_FOUND)
if(BUILD_btl_mkl) if(BUILD_btl_mkl)
target_link_libraries(btl_mkl ${MKL_LIBRARIES}) target_link_libraries(btl_mkl ${MKL_LIBRARIES})
set_target_properties(btl_mkl PROPERTIES COMPILE_FLAGS "-DCBLASNAME=INTEL_MKL -DHAS_LAPACK=1") set_target_properties(btl_mkl PROPERTIES COMPILE_FLAGS "-DCBLASNAME=INTEL_MKL -DHAS_LAPACK=1")
endif(BUILD_btl_mkl) endif()
endif (MKL_FOUND) endif ()
find_package(OPENBLAS) find_package(OPENBLAS)
@ -24,8 +24,8 @@ if (OPENBLAS_FOUND)
if(BUILD_btl_openblas) if(BUILD_btl_openblas)
target_link_libraries(btl_openblas ${OPENBLAS_LIBRARIES} ) target_link_libraries(btl_openblas ${OPENBLAS_LIBRARIES} )
set_target_properties(btl_openblas PROPERTIES COMPILE_FLAGS "-DCBLASNAME=OPENBLAS") set_target_properties(btl_openblas PROPERTIES COMPILE_FLAGS "-DCBLASNAME=OPENBLAS")
endif(BUILD_btl_openblas) endif()
endif (OPENBLAS_FOUND) endif ()
find_package(ACML) find_package(ACML)
if (ACML_FOUND) if (ACML_FOUND)
@ -33,8 +33,8 @@ if (ACML_FOUND)
if(BUILD_btl_acml) if(BUILD_btl_acml)
target_link_libraries(btl_acml ${ACML_LIBRARIES} ) target_link_libraries(btl_acml ${ACML_LIBRARIES} )
set_target_properties(btl_acml PROPERTIES COMPILE_FLAGS "-DCBLASNAME=ACML -DHAS_LAPACK=1") set_target_properties(btl_acml PROPERTIES COMPILE_FLAGS "-DCBLASNAME=ACML -DHAS_LAPACK=1")
endif(BUILD_btl_acml) endif()
endif (ACML_FOUND) endif ()
if(Eigen_SOURCE_DIR AND CMAKE_Fortran_COMPILER_WORKS) if(Eigen_SOURCE_DIR AND CMAKE_Fortran_COMPILER_WORKS)
# we are inside Eigen and blas/lapack interface is compilable # we are inside Eigen and blas/lapack interface is compilable

6
bench/btl/libs/blitz/CMakeLists.txt
View File

@ -7,11 +7,11 @@ if (BLITZ_FOUND)
btl_add_bench(btl_blitz btl_blitz.cpp) btl_add_bench(btl_blitz btl_blitz.cpp)
if (BUILD_btl_blitz) if (BUILD_btl_blitz)
target_link_libraries(btl_blitz ${BLITZ_LIBRARIES}) target_link_libraries(btl_blitz ${BLITZ_LIBRARIES})
endif (BUILD_btl_blitz) endif ()
btl_add_bench(btl_tiny_blitz btl_tiny_blitz.cpp OFF) btl_add_bench(btl_tiny_blitz btl_tiny_blitz.cpp OFF)
if (BUILD_btl_tiny_blitz) if (BUILD_btl_tiny_blitz)
target_link_libraries(btl_tiny_blitz ${BLITZ_LIBRARIES}) target_link_libraries(btl_tiny_blitz ${BLITZ_LIBRARIES})
endif (BUILD_btl_tiny_blitz) endif ()
endif (BLITZ_FOUND) endif ()

10
bench/btl/libs/eigen3/CMakeLists.txt
View File

@ -47,9 +47,9 @@ if (EIGEN3_FOUND)
# if(BUILD_btl_eigen3_adv) # if(BUILD_btl_eigen3_adv)
# target_link_libraries(btl_eigen3_adv ${MKL_LIBRARIES}) # target_link_libraries(btl_eigen3_adv ${MKL_LIBRARIES})
# endif(BUILD_btl_eigen3_adv) # endif()
endif(NOT BTL_NOVEC) endif()
btl_add_bench(btl_tiny_eigen3 btl_tiny_eigen3.cpp OFF) btl_add_bench(btl_tiny_eigen3 btl_tiny_eigen3.cpp OFF)
@ -59,7 +59,7 @@ if (EIGEN3_FOUND)
if(BUILD_btl_tiny_eigen3_novec) if(BUILD_btl_tiny_eigen3_novec)
btl_add_target_property(btl_tiny_eigen3_novec COMPILE_FLAGS "-DEIGEN_DONT_VECTORIZE -DBTL_PREFIX=eigen3_tiny_novec") btl_add_target_property(btl_tiny_eigen3_novec COMPILE_FLAGS "-DEIGEN_DONT_VECTORIZE -DBTL_PREFIX=eigen3_tiny_novec")
endif(BUILD_btl_tiny_eigen3_novec) endif()
endif(NOT BTL_NOVEC) endif()
endif (EIGEN3_FOUND) endif ()

2
bench/btl/libs/gmm/CMakeLists.txt
View File

@ -3,4 +3,4 @@ find_package(GMM)
if (GMM_FOUND) if (GMM_FOUND)
include_directories(${GMM_INCLUDES}) include_directories(${GMM_INCLUDES})
btl_add_bench(btl_gmm main.cpp) btl_add_bench(btl_gmm main.cpp)
endif (GMM_FOUND) endif ()

2
bench/btl/libs/mtl4/CMakeLists.txt
View File

@ -3,4 +3,4 @@ find_package(MTL4)
if (MTL4_FOUND) if (MTL4_FOUND)
include_directories(${MTL4_INCLUDE_DIR}) include_directories(${MTL4_INCLUDE_DIR})
btl_add_bench(btl_mtl4 main.cpp) btl_add_bench(btl_mtl4 main.cpp)
endif (MTL4_FOUND) endif ()

4
bench/btl/libs/tensors/CMakeLists.txt
View File

@ -39,6 +39,6 @@ if (TENSOR_FOUND)
btl_add_target_property(btl_tensor_novec_vecmat COMPILE_FLAGS "-fno-exceptions -DEIGEN_DONT_VECTORIZE -DBTL_PREFIX=tensor_novec") btl_add_target_property(btl_tensor_novec_vecmat COMPILE_FLAGS "-fno-exceptions -DEIGEN_DONT_VECTORIZE -DBTL_PREFIX=tensor_novec")
btl_add_target_property(btl_tensor_novec_matmat COMPILE_FLAGS "-fno-exceptions -DEIGEN_DONT_VECTORIZE -DBTL_PREFIX=tensor_novec") btl_add_target_property(btl_tensor_novec_matmat COMPILE_FLAGS "-fno-exceptions -DEIGEN_DONT_VECTORIZE -DBTL_PREFIX=tensor_novec")
endif(NOT BTL_NOVEC) endif()
endif (TENSOR_FOUND) endif ()

2
bench/btl/libs/tvmet/CMakeLists.txt
View File

@ -3,4 +3,4 @@ find_package(Tvmet)
if (TVMET_FOUND) if (TVMET_FOUND)
include_directories(${TVMET_INCLUDE_DIR}) include_directories(${TVMET_INCLUDE_DIR})
btl_add_bench(btl_tvmet main.cpp OFF) btl_add_bench(btl_tvmet main.cpp OFF)
endif (TVMET_FOUND) endif ()

2
bench/btl/libs/ublas/CMakeLists.txt
View File

@ -4,4 +4,4 @@ if (Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
include_directories(${Boost_INCLUDES}) include_directories(${Boost_INCLUDES})
btl_add_bench(btl_ublas main.cpp) btl_add_bench(btl_ublas main.cpp)
endif (Boost_FOUND) endif ()

8
bench/spbench/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(SPARSE_LIBS "")
# if(PARDISO_LIBRARIES) # if(PARDISO_LIBRARIES)
# add_definitions("-DEIGEN_PARDISO_SUPPORT") # add_definitions("-DEIGEN_PARDISO_SUPPORT")
# set(SPARSE_LIBS ${SPARSE_LIBS} ${PARDISO_LIBRARIES}) # set(SPARSE_LIBS ${SPARSE_LIBS} ${PARDISO_LIBRARIES})
# endif(PARDISO_LIBRARIES) # endif()
find_package(Cholmod) find_package(Cholmod)
if(CHOLMOD_FOUND AND BLAS_FOUND AND LAPACK_FOUND) if(CHOLMOD_FOUND AND BLAS_FOUND AND LAPACK_FOUND)
@ -57,7 +57,7 @@ if(PASTIX_FOUND AND PASTIX_pastix_nompi.h_INCLUDE_DIRS AND BLAS_FOUND)
elseif(METIS_FOUND) elseif(METIS_FOUND)
include_directories(${METIS_INCLUDE_DIRS}) include_directories(${METIS_INCLUDE_DIRS})
set(PASTIX_LIBRARIES ${PASTIX_LIBRARIES} ${METIS_LIBRARIES}) set(PASTIX_LIBRARIES ${PASTIX_LIBRARIES} ${METIS_LIBRARIES})
endif(SCOTCH_FOUND) endif()
set(SPARSE_LIBS ${SPARSE_LIBS} ${PASTIX_LIBRARIES_DEP} ${ORDERING_LIBRARIES}) set(SPARSE_LIBS ${SPARSE_LIBS} ${PASTIX_LIBRARIES_DEP} ${ORDERING_LIBRARIES})
set(PASTIX_ALL_LIBS ${PASTIX_LIBRARIES_DEP}) set(PASTIX_ALL_LIBS ${PASTIX_LIBRARIES_DEP})
endif() endif()
@ -66,12 +66,12 @@ if(METIS_FOUND)
include_directories(${METIS_INCLUDE_DIRS}) include_directories(${METIS_INCLUDE_DIRS})
set (SPARSE_LIBS ${SPARSE_LIBS} ${METIS_LIBRARIES}) set (SPARSE_LIBS ${SPARSE_LIBS} ${METIS_LIBRARIES})
add_definitions("-DEIGEN_METIS_SUPPORT") add_definitions("-DEIGEN_METIS_SUPPORT")
endif(METIS_FOUND) endif()
find_library(RT_LIBRARY rt) find_library(RT_LIBRARY rt)
if(RT_LIBRARY) if(RT_LIBRARY)
set(SPARSE_LIBS ${SPARSE_LIBS} ${RT_LIBRARY}) set(SPARSE_LIBS ${SPARSE_LIBS} ${RT_LIBRARY})
endif(RT_LIBRARY) endif()
add_executable(spbenchsolver spbenchsolver.cpp) add_executable(spbenchsolver spbenchsolver.cpp)
target_link_libraries (spbenchsolver ${SPARSE_LIBS}) target_link_libraries (spbenchsolver ${SPARSE_LIBS})

2
blas/testing/CMakeLists.txt
View File

@ -17,7 +17,7 @@ macro(ei_add_blas_test testname)
add_test(${testname} "${Eigen_SOURCE_DIR}/blas/testing/runblastest.sh" "${testname}" "${Eigen_SOURCE_DIR}/blas/testing/${testname}.dat") add_test(${testname} "${Eigen_SOURCE_DIR}/blas/testing/runblastest.sh" "${testname}" "${Eigen_SOURCE_DIR}/blas/testing/${testname}.dat")
add_dependencies(buildtests ${targetname}) add_dependencies(buildtests ${targetname})
endmacro(ei_add_blas_test) endmacro()
ei_add_blas_test(sblat1) ei_add_blas_test(sblat1)
ei_add_blas_test(sblat2) ei_add_blas_test(sblat2)

4
cmake/EigenConfigureTesting.cmake
View File

@ -49,10 +49,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(COVERAGE_FLAGS "-fprofile-arcs -ftest-coverage") set(COVERAGE_FLAGS "-fprofile-arcs -ftest-coverage")
set(CTEST_CUSTOM_COVERAGE_EXCLUDE "/test/") set(CTEST_CUSTOM_COVERAGE_EXCLUDE "/test/")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_FLAGS}")
endif(EIGEN_COVERAGE_TESTING) endif()
elseif(MSVC) elseif(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS")
endif(CMAKE_COMPILER_IS_GNUCXX) endif()

58
cmake/EigenTesting.cmake
View File

@ -6,7 +6,7 @@ macro(ei_add_property prop value)
else() else()
set_property(GLOBAL PROPERTY ${prop} "${previous} ${value}") set_property(GLOBAL PROPERTY ${prop} "${previous} ${value}")
endif() endif()
endmacro(ei_add_property) endmacro()
#internal. See documentation of ei_add_test for details. #internal. See documentation of ei_add_test for details.
macro(ei_add_test_internal testname testname_with_suffix) macro(ei_add_test_internal testname testname_with_suffix)
@ -60,11 +60,11 @@ macro(ei_add_test_internal testname testname_with_suffix)
if(EIGEN_NO_ASSERTION_CHECKING) if(EIGEN_NO_ASSERTION_CHECKING)
ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1") ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1")
else(EIGEN_NO_ASSERTION_CHECKING) else()
if(EIGEN_DEBUG_ASSERTS) if(EIGEN_DEBUG_ASSERTS)
ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_DEBUG_ASSERTS=1") ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_DEBUG_ASSERTS=1")
endif(EIGEN_DEBUG_ASSERTS) endif()
endif(EIGEN_NO_ASSERTION_CHECKING) endif()
ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_MAX_SIZE=${EIGEN_TEST_MAX_SIZE}") ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_MAX_SIZE=${EIGEN_TEST_MAX_SIZE}")
@ -75,7 +75,7 @@ macro(ei_add_test_internal testname testname_with_suffix)
# let the user pass flags. # let the user pass flags.
if(${ARGC} GREATER 2) if(${ARGC} GREATER 2)
ei_add_target_property(${targetname} COMPILE_FLAGS "${ARGV2}") ei_add_target_property(${targetname} COMPILE_FLAGS "${ARGV2}")
endif(${ARGC} GREATER 2) endif()
if(EIGEN_TEST_CUSTOM_CXX_FLAGS) if(EIGEN_TEST_CUSTOM_CXX_FLAGS)
ei_add_target_property(${targetname} COMPILE_FLAGS "${EIGEN_TEST_CUSTOM_CXX_FLAGS}") ei_add_target_property(${targetname} COMPILE_FLAGS "${EIGEN_TEST_CUSTOM_CXX_FLAGS}")
@ -114,7 +114,7 @@ macro(ei_add_test_internal testname testname_with_suffix)
set_property(TEST ${testname_with_suffix} PROPERTY LABELS "${current_subproject}") set_property(TEST ${testname_with_suffix} PROPERTY LABELS "${current_subproject}")
endif() endif()
endmacro(ei_add_test_internal) endmacro()
# SYCL # SYCL
macro(ei_add_test_internal_sycl testname testname_with_suffix) macro(ei_add_test_internal_sycl testname testname_with_suffix)
@ -160,11 +160,11 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)
if(EIGEN_NO_ASSERTION_CHECKING) if(EIGEN_NO_ASSERTION_CHECKING)
ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1") ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_NO_ASSERTION_CHECKING=1")
else(EIGEN_NO_ASSERTION_CHECKING) else()
if(EIGEN_DEBUG_ASSERTS) if(EIGEN_DEBUG_ASSERTS)
ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_DEBUG_ASSERTS=1") ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_DEBUG_ASSERTS=1")
endif(EIGEN_DEBUG_ASSERTS) endif()
endif(EIGEN_NO_ASSERTION_CHECKING) endif()
ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_MAX_SIZE=${EIGEN_TEST_MAX_SIZE}") ei_add_target_property(${targetname} COMPILE_FLAGS "-DEIGEN_TEST_MAX_SIZE=${EIGEN_TEST_MAX_SIZE}")
@ -175,7 +175,7 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)
# let the user pass flags. # let the user pass flags.
if(${ARGC} GREATER 2) if(${ARGC} GREATER 2)
ei_add_target_property(${targetname} COMPILE_FLAGS "${ARGV2}") ei_add_target_property(${targetname} COMPILE_FLAGS "${ARGV2}")
endif(${ARGC} GREATER 2) endif()
if(EIGEN_TEST_CUSTOM_CXX_FLAGS) if(EIGEN_TEST_CUSTOM_CXX_FLAGS)
ei_add_target_property(${targetname} COMPILE_FLAGS "${EIGEN_TEST_CUSTOM_CXX_FLAGS}") ei_add_target_property(${targetname} COMPILE_FLAGS "${EIGEN_TEST_CUSTOM_CXX_FLAGS}")
@ -215,7 +215,7 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix)
endif() endif()
endmacro(ei_add_test_internal_sycl) endmacro()
# Macro to add a test # Macro to add a test
@ -290,11 +290,11 @@ macro(ei_add_test testname)
ei_add_test_internal(${testname} ${testname}_${suffix} ei_add_test_internal(${testname} ${testname}_${suffix}
"${ARGV1} -DEIGEN_TEST_PART_${suffix}=1" "${ARGV2}") "${ARGV1} -DEIGEN_TEST_PART_${suffix}=1" "${ARGV2}")
add_dependencies(${testname} ${testname}_${suffix}) add_dependencies(${testname} ${testname}_${suffix})
endforeach(suffix) endforeach()
else() else()
ei_add_test_internal(${testname} ${testname} "${ARGV1} -DEIGEN_TEST_PART_ALL=1" "${ARGV2}") ei_add_test_internal(${testname} ${testname} "${ARGV1} -DEIGEN_TEST_PART_ALL=1" "${ARGV2}")
endif() endif()
endmacro(ei_add_test) endmacro()
macro(ei_add_test_sycl testname) macro(ei_add_test_sycl testname)
get_property(EIGEN_TESTS_LIST GLOBAL PROPERTY EIGEN_TESTS_LIST) get_property(EIGEN_TESTS_LIST GLOBAL PROPERTY EIGEN_TESTS_LIST)
@ -319,16 +319,16 @@ macro(ei_add_test_sycl testname)
ei_add_test_internal_sycl(${testname} ${testname}_${suffix} ei_add_test_internal_sycl(${testname} ${testname}_${suffix}
"${ARGV1} -DEIGEN_TEST_PART_${suffix}=1" "${ARGV2}") "${ARGV1} -DEIGEN_TEST_PART_${suffix}=1" "${ARGV2}")
add_dependencies(${testname} ${testname}_${suffix}) add_dependencies(${testname} ${testname}_${suffix})
endforeach(suffix) endforeach()
else(EIGEN_SPLIT_LARGE_TESTS AND suffixes) else()
set(symbols_to_enable_all_parts "") set(symbols_to_enable_all_parts "")
foreach(suffix ${suffixes}) foreach(suffix ${suffixes})
set(symbols_to_enable_all_parts set(symbols_to_enable_all_parts
"${symbols_to_enable_all_parts} -DEIGEN_TEST_PART_${suffix}=1") "${symbols_to_enable_all_parts} -DEIGEN_TEST_PART_${suffix}=1")
endforeach(suffix) endforeach()
ei_add_test_internal_sycl(${testname} ${testname} "${ARGV1} ${symbols_to_enable_all_parts}" "${ARGV2}") ei_add_test_internal_sycl(${testname} ${testname} "${ARGV1} ${symbols_to_enable_all_parts}" "${ARGV2}")
endif(EIGEN_SPLIT_LARGE_TESTS AND suffixes) endif()
endmacro(ei_add_test_sycl) endmacro()
# adds a failtest, i.e. a test that succeed if the program fails to compile # adds a failtest, i.e. a test that succeed if the program fails to compile
# note that the test runner for these is CMake itself, when passed -DEIGEN_FAILTEST=ON # note that the test runner for these is CMake itself, when passed -DEIGEN_FAILTEST=ON
@ -360,7 +360,7 @@ macro(ei_add_failtest testname)
# Expect the second test to fail # Expect the second test to fail
set_tests_properties(${test_target_ko} PROPERTIES WILL_FAIL TRUE) set_tests_properties(${test_target_ko} PROPERTIES WILL_FAIL TRUE)
endmacro(ei_add_failtest) endmacro()
# print a summary of the different options # print a summary of the different options
macro(ei_testing_print_summary) macro(ei_testing_print_summary)
@ -510,7 +510,7 @@ macro(ei_testing_print_summary)
message(STATUS "\n${EIGEN_TESTING_SUMMARY}") message(STATUS "\n${EIGEN_TESTING_SUMMARY}")
message(STATUS "************************************************************") message(STATUS "************************************************************")
endmacro(ei_testing_print_summary) endmacro()
macro(ei_init_testing) macro(ei_init_testing)
define_property(GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT BRIEF_DOCS " " FULL_DOCS " ") define_property(GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT BRIEF_DOCS " " FULL_DOCS " ")
@ -532,7 +532,7 @@ macro(ei_init_testing)
# uncomment anytime you change the ei_get_compilerver_from_cxx_version_string macro # uncomment anytime you change the ei_get_compilerver_from_cxx_version_string macro
# ei_test_get_compilerver_from_cxx_version_string() # ei_test_get_compilerver_from_cxx_version_string()
endmacro(ei_init_testing) endmacro()
macro(ei_set_sitename) macro(ei_set_sitename)
# if the sitename is not yet set, try to set it # if the sitename is not yet set, try to set it
@ -549,7 +549,7 @@ macro(ei_set_sitename)
if(SITE) if(SITE)
string(TOLOWER ${SITE} SITE) string(TOLOWER ${SITE} SITE)
endif() endif()
endmacro(ei_set_sitename) endmacro()
macro(ei_get_compilerver VAR) macro(ei_get_compilerver VAR)
if(MSVC) if(MSVC)
@ -582,7 +582,7 @@ macro(ei_get_compilerver VAR)
set(${VAR} "${CNAME}-${CVER}") set(${VAR} "${CNAME}-${CVER}")
endif() endif()
endmacro(ei_get_compilerver) endmacro()
# Extract compiler name and version from a raw version string # Extract compiler name and version from a raw version string
# WARNING: if you edit thid macro, then please test it by uncommenting # WARNING: if you edit thid macro, then please test it by uncommenting
@ -631,7 +631,7 @@ macro(ei_get_compilerver_from_cxx_version_string VERSTRING CNAME CVER)
string(REGEX REPLACE ".(.*)" "\\1" ${CVER} ${eicver}) string(REGEX REPLACE ".(.*)" "\\1" ${CVER} ${eicver})
endmacro(ei_get_compilerver_from_cxx_version_string) endmacro()
macro(ei_get_cxxflags VAR) macro(ei_get_cxxflags VAR)
set(${VAR} "") set(${VAR} "")
@ -679,7 +679,7 @@ macro(ei_get_cxxflags VAR)
set(${VAR} ${${VAR}}-ROWMAJ) set(${VAR} ${${VAR}}-ROWMAJ)
endif() endif()
endif() endif()
endmacro(ei_get_cxxflags) endmacro()
macro(ei_set_build_string) macro(ei_set_build_string)
ei_get_compilerver(LOCAL_COMPILER_VERSION) ei_get_compilerver(LOCAL_COMPILER_VERSION)
@ -714,7 +714,7 @@ macro(ei_set_build_string)
endif() endif()
string(TOLOWER ${TMP_BUILD_STRING} BUILDNAME) string(TOLOWER ${TMP_BUILD_STRING} BUILDNAME)
endmacro(ei_set_build_string) endmacro()
macro(ei_is_64bit_env VAR) macro(ei_is_64bit_env VAR)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@ -724,7 +724,7 @@ macro(ei_is_64bit_env VAR)
else() else()
message(WARNING "Unsupported pointer size. Please contact the authors.") message(WARNING "Unsupported pointer size. Please contact the authors.")
endif() endif()
endmacro(ei_is_64bit_env) endmacro()
# helper macro for testing ei_get_compilerver_from_cxx_version_string # helper macro for testing ei_get_compilerver_from_cxx_version_string
@ -737,7 +737,7 @@ macro(ei_test1_get_compilerver_from_cxx_version_string STR REFNAME REFVER)
message("STATUS ei_get_compilerver_from_cxx_version_string error:") message("STATUS ei_get_compilerver_from_cxx_version_string error:")
message("Expected \"${REFNAME}-${REFVER}\", got \"${CNAME}-${CVER}\"") message("Expected \"${REFNAME}-${REFVER}\", got \"${CNAME}-${CVER}\"")
endif() endif()
endmacro(ei_test1_get_compilerver_from_cxx_version_string) endmacro()
# macro for testing ei_get_compilerver_from_cxx_version_string # macro for testing ei_get_compilerver_from_cxx_version_string
# feel free to add more version strings # feel free to add more version strings
@ -752,4 +752,4 @@ macro(ei_test_get_compilerver_from_cxx_version_string)
ei_test1_get_compilerver_from_cxx_version_string("i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)" "llvm-g++" "4.2.1") ei_test1_get_compilerver_from_cxx_version_string("i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)" "llvm-g++" "4.2.1")
ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 4.4.6" "g++" "4.4.6") ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 4.4.6" "g++" "4.4.6")
ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 2011" "g++" "4.4") ei_test1_get_compilerver_from_cxx_version_string("g++-mp-4.4 (GCC) 2011" "g++" "4.4")
endmacro(ei_test_get_compilerver_from_cxx_version_string) endmacro()

2
cmake/EigenUninstall.cmake
View File

@ -27,7 +27,7 @@ if(EXISTS ${MANIFEST})
else() else()
message(STATUS "File '${file}' does not exist.") message(STATUS "File '${file}' does not exist.")
endif() endif()
endforeach(file) endforeach()
message(STATUS "========== Finished Uninstalling Eigen ==============") message(STATUS "========== Finished Uninstalling Eigen ==============")
else() else()

2
cmake/FindAdolc.cmake
View File

@ -1,7 +1,7 @@
if (ADOLC_INCLUDES AND ADOLC_LIBRARIES) if (ADOLC_INCLUDES AND ADOLC_LIBRARIES)
set(ADOLC_FIND_QUIETLY TRUE) set(ADOLC_FIND_QUIETLY TRUE)
endif (ADOLC_INCLUDES AND ADOLC_LIBRARIES) endif ()
find_path(ADOLC_INCLUDES find_path(ADOLC_INCLUDES
NAMES NAMES

70
cmake/FindBLAS.cmake
View File

@ -270,8 +270,8 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread)
endif () endif ()
set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY}) set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
set(_libraries_work ${${_prefix}_${_library}_LIBRARY}) set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
endif(_libraries_work) endif()
endforeach(_library ${_list}) endforeach()
if(_libraries_work) if(_libraries_work)
# Test this combination of libraries. # Test this combination of libraries.
@ -310,11 +310,11 @@ macro(Check_Fortran_Libraries LIBRARIES _prefix _name _flags _list _thread)
if(_libraries_work) if(_libraries_work)
set(${LIBRARIES} ${${LIBRARIES}} ${_thread}) set(${LIBRARIES} ${${LIBRARIES}} ${_thread})
else(_libraries_work) else()
set(${LIBRARIES} FALSE) set(${LIBRARIES} FALSE)
endif(_libraries_work) endif()
endmacro(Check_Fortran_Libraries) endmacro()
set(BLAS_LINKER_FLAGS) set(BLAS_LINKER_FLAGS)
@ -438,7 +438,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
if (OMP_gomp_LIBRARY) if (OMP_gomp_LIBRARY)
set(OMP_LIB "${OMP_gomp_LIBRARY}") set(OMP_LIB "${OMP_gomp_LIBRARY}")
endif() endif()
else(CMAKE_C_COMPILER_ID STREQUAL "Intel") else()
if (OMP_iomp5_LIBRARY) if (OMP_iomp5_LIBRARY)
set(OMP_LIB "${OMP_iomp5_LIBRARY}") set(OMP_LIB "${OMP_iomp5_LIBRARY}")
endif() endif()
@ -560,7 +560,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
"${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}") "${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}")
endforeach() endforeach()
endforeach() endforeach()
else (WIN32) else ()
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All") if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
list(APPEND BLAS_SEARCH_LIBS list(APPEND BLAS_SEARCH_LIBS
"mkl_blas95 mkl_intel mkl_intel_thread mkl_core guide") "mkl_blas95 mkl_intel mkl_intel_thread mkl_core guide")
@ -586,9 +586,9 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
set(OMP_LIB "") set(OMP_LIB "")
endif() endif()
endif () endif ()
endif (WIN32) endif ()
else (BLA_F95) else ()
set(BLAS_mkl_SEARCH_SYMBOL sgemm) set(BLAS_mkl_SEARCH_SYMBOL sgemm)
set(_LIBRARIES BLAS_LIBRARIES) set(_LIBRARIES BLAS_LIBRARIES)
@ -632,7 +632,7 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
"${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}") "${MAIN} ${THREAD} mkl_core${BLAS_mkl_DLL_SUFFIX}")
endforeach() endforeach()
endforeach() endforeach()
else (WIN32) else ()
if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All") if (BLA_VENDOR STREQUAL "Intel10_32" OR BLA_VENDOR STREQUAL "All")
list(APPEND BLAS_SEARCH_LIBS list(APPEND BLAS_SEARCH_LIBS
"mkl_intel mkl_intel_thread mkl_core guide") "mkl_intel mkl_intel_thread mkl_core guide")
@ -667,9 +667,9 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
list(APPEND BLAS_SEARCH_LIBS list(APPEND BLAS_SEARCH_LIBS
"mkl_em64t") "mkl_em64t")
endif () endif ()
endif (WIN32) endif ()
endif (BLA_F95) endif ()
foreach (IT ${BLAS_SEARCH_LIBS}) foreach (IT ${BLAS_SEARCH_LIBS})
string(REPLACE " " ";" SEARCH_LIBS ${IT}) string(REPLACE " " ";" SEARCH_LIBS ${IT})
@ -698,9 +698,9 @@ if (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All")
if (${_LIBRARIES} AND NOT BLAS_VENDOR_FOUND) if (${_LIBRARIES} AND NOT BLAS_VENDOR_FOUND)
set (BLAS_VENDOR_FOUND "Intel MKL") set (BLAS_VENDOR_FOUND "Intel MKL")
endif() endif()
endif (_LANGUAGES_ MATCHES C OR _LANGUAGES_ MATCHES CXX) endif ()
endif(NOT BLAS_LIBRARIES OR BLA_VENDOR MATCHES "Intel*") endif()
endif (BLA_VENDOR MATCHES "Intel*" OR BLA_VENDOR STREQUAL "All") endif ()
if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All") if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
@ -727,7 +727,7 @@ if (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "Goto") set (BLAS_VENDOR_FOUND "Goto")
endif() endif()
endif (BLA_VENDOR STREQUAL "Goto" OR BLA_VENDOR STREQUAL "All") endif ()
# OpenBlas # OpenBlas
@ -755,7 +755,7 @@ if (BLA_VENDOR STREQUAL "Open" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "Openblas") set (BLAS_VENDOR_FOUND "Openblas")
endif() endif()
endif (BLA_VENDOR STREQUAL "Open" OR BLA_VENDOR STREQUAL "All") endif ()
# EigenBlas # EigenBlas
@ -802,7 +802,7 @@ if (BLA_VENDOR STREQUAL "Eigen" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "Eigen") set (BLAS_VENDOR_FOUND "Eigen")
endif() endif()
endif (BLA_VENDOR STREQUAL "Eigen" OR BLA_VENDOR STREQUAL "All") endif ()
if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All") if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
@ -830,7 +830,7 @@ if (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "Atlas") set (BLAS_VENDOR_FOUND "Atlas")
endif() endif()
endif (BLA_VENDOR STREQUAL "ATLAS" OR BLA_VENDOR STREQUAL "All") endif ()
# BLAS in PhiPACK libraries? (requires generic BLAS lib, too) # BLAS in PhiPACK libraries? (requires generic BLAS lib, too)
@ -858,7 +858,7 @@ if (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "PhiPACK") set (BLAS_VENDOR_FOUND "PhiPACK")
endif() endif()
endif (BLA_VENDOR STREQUAL "PhiPACK" OR BLA_VENDOR STREQUAL "All") endif ()
# BLAS in Alpha CXML library? # BLAS in Alpha CXML library?
@ -886,7 +886,7 @@ if (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "CXML") set (BLAS_VENDOR_FOUND "CXML")
endif() endif()
endif (BLA_VENDOR STREQUAL "CXML" OR BLA_VENDOR STREQUAL "All") endif ()
# BLAS in Alpha DXML library? (now called CXML, see above) # BLAS in Alpha DXML library? (now called CXML, see above)
@ -914,7 +914,7 @@ if (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "DXML") set (BLAS_VENDOR_FOUND "DXML")
endif() endif()
endif (BLA_VENDOR STREQUAL "DXML" OR BLA_VENDOR STREQUAL "All") endif ()
# BLAS in Sun Performance library? # BLAS in Sun Performance library?
@ -1124,7 +1124,7 @@ if (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All")
"${_ACML_ROOT}/${_ACML_COMPILER64}${_ACML_PATH_SUFFIX}/lib" ) "${_ACML_ROOT}/${_ACML_COMPILER64}${_ACML_PATH_SUFFIX}/lib" )
endif() endif()
endif(_ACML_ROOT) endif()
elseif(BLAS_${BLA_VENDOR}_LIB_DIRS) elseif(BLAS_${BLA_VENDOR}_LIB_DIRS)
@ -1229,7 +1229,7 @@ if (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "ACML") set (BLAS_VENDOR_FOUND "ACML")
endif() endif()
endif (BLA_VENDOR MATCHES "ACML.*" OR BLA_VENDOR STREQUAL "All") # ACML endif () # ACML
# Apple BLAS library? # Apple BLAS library?
@ -1257,7 +1257,7 @@ if (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "Apple Accelerate") set (BLAS_VENDOR_FOUND "Apple Accelerate")
endif() endif()
endif (BLA_VENDOR STREQUAL "Apple" OR BLA_VENDOR STREQUAL "All") endif ()
if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All") if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
@ -1284,7 +1284,7 @@ if (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "NAS") set (BLAS_VENDOR_FOUND "NAS")
endif() endif()
endif (BLA_VENDOR STREQUAL "NAS" OR BLA_VENDOR STREQUAL "All") endif ()
# Generic BLAS library? # Generic BLAS library?
@ -1316,7 +1316,7 @@ if (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All")
set (BLAS_VENDOR_FOUND "Netlib or other Generic libblas") set (BLAS_VENDOR_FOUND "Netlib or other Generic libblas")
endif() endif()
endif (BLA_VENDOR STREQUAL "Generic" OR BLA_VENDOR STREQUAL "All") endif ()
if(BLA_F95) if(BLA_F95)
@ -1331,7 +1331,7 @@ if(BLA_F95)
if(BLAS95_FOUND) if(BLAS95_FOUND)
message(STATUS "A library with BLAS95 API found.") message(STATUS "A library with BLAS95 API found.")
message(STATUS "BLAS_LIBRARIES ${BLAS_LIBRARIES}") message(STATUS "BLAS_LIBRARIES ${BLAS_LIBRARIES}")
else(BLAS95_FOUND) else()
message(WARNING "BLA_VENDOR has been set to ${BLA_VENDOR} but blas 95 libraries could not be found or check of symbols failed." message(WARNING "BLA_VENDOR has been set to ${BLA_VENDOR} but blas 95 libraries could not be found or check of symbols failed."
"\nPlease indicate where to find blas libraries. You have three options:\n" "\nPlease indicate where to find blas libraries. You have three options:\n"
"- Option 1: Provide the installation directory of BLAS library with cmake option: -DBLAS_DIR=your/path/to/blas\n" "- Option 1: Provide the installation directory of BLAS library with cmake option: -DBLAS_DIR=your/path/to/blas\n"
@ -1349,13 +1349,13 @@ if(BLA_F95)
message(STATUS message(STATUS
"A library with BLAS95 API not found. Please specify library location.") "A library with BLAS95 API not found. Please specify library location.")
endif() endif()
endif(BLAS95_FOUND) endif()
endif(NOT BLAS_FIND_QUIETLY) endif()
set(BLAS_FOUND TRUE) set(BLAS_FOUND TRUE)
set(BLAS_LIBRARIES "${BLAS95_LIBRARIES}") set(BLAS_LIBRARIES "${BLAS95_LIBRARIES}")
else(BLA_F95) else()
if(BLAS_LIBRARIES) if(BLAS_LIBRARIES)
set(BLAS_FOUND TRUE) set(BLAS_FOUND TRUE)
@ -1367,7 +1367,7 @@ else(BLA_F95)
if(BLAS_FOUND) if(BLAS_FOUND)
message(STATUS "A library with BLAS API found.") message(STATUS "A library with BLAS API found.")
message(STATUS "BLAS_LIBRARIES ${BLAS_LIBRARIES}") message(STATUS "BLAS_LIBRARIES ${BLAS_LIBRARIES}")
else(BLAS_FOUND) else()
message(WARNING "BLA_VENDOR has been set to ${BLA_VENDOR} but blas libraries could not be found or check of symbols failed." message(WARNING "BLA_VENDOR has been set to ${BLA_VENDOR} but blas libraries could not be found or check of symbols failed."
"\nPlease indicate where to find blas libraries. You have three options:\n" "\nPlease indicate where to find blas libraries. You have three options:\n"
"- Option 1: Provide the installation directory of BLAS library with cmake option: -DBLAS_DIR=your/path/to/blas\n" "- Option 1: Provide the installation directory of BLAS library with cmake option: -DBLAS_DIR=your/path/to/blas\n"
@ -1385,10 +1385,10 @@ else(BLA_F95)
message(STATUS message(STATUS
"A library with BLAS API not found. Please specify library location.") "A library with BLAS API not found. Please specify library location.")
endif() endif()
endif(BLAS_FOUND) endif()
endif(NOT BLAS_FIND_QUIETLY) endif()
endif(BLA_F95) endif()
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})

16
cmake/FindCholmod.cmake
View File

@ -3,7 +3,7 @@
if (CHOLMOD_INCLUDES AND CHOLMOD_LIBRARIES) if (CHOLMOD_INCLUDES AND CHOLMOD_LIBRARIES)
set(CHOLMOD_FIND_QUIETLY TRUE) set(CHOLMOD_FIND_QUIETLY TRUE)
endif (CHOLMOD_INCLUDES AND CHOLMOD_LIBRARIES) endif ()
find_path(CHOLMOD_INCLUDES find_path(CHOLMOD_INCLUDES
NAMES NAMES
@ -29,7 +29,7 @@ if(CHOLMOD_LIBRARIES)
set(CHOLMOD_LIBRARIES FALSE) set(CHOLMOD_LIBRARIES FALSE)
endif () endif ()
endif(CHOLMOD_LIBRARIES) endif()
if(CHOLMOD_LIBRARIES) if(CHOLMOD_LIBRARIES)
@ -40,7 +40,7 @@ if(CHOLMOD_LIBRARIES)
set(CHOLMOD_LIBRARIES FALSE) set(CHOLMOD_LIBRARIES FALSE)
endif () endif ()
endif(CHOLMOD_LIBRARIES) endif()
if(CHOLMOD_LIBRARIES) if(CHOLMOD_LIBRARIES)
@ -51,7 +51,7 @@ if(CHOLMOD_LIBRARIES)
set(CHOLMOD_LIBRARIES FALSE) set(CHOLMOD_LIBRARIES FALSE)
endif () endif ()
endif(CHOLMOD_LIBRARIES) endif()
if(CHOLMOD_LIBRARIES) if(CHOLMOD_LIBRARIES)
@ -62,7 +62,7 @@ if(CHOLMOD_LIBRARIES)
set(CHOLMOD_LIBRARIES FALSE) set(CHOLMOD_LIBRARIES FALSE)
endif () endif ()
endif(CHOLMOD_LIBRARIES) endif()
if(CHOLMOD_LIBRARIES) if(CHOLMOD_LIBRARIES)
@ -71,16 +71,16 @@ if(CHOLMOD_LIBRARIES)
set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${CHOLMOD_METIS_LIBRARY}) set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${CHOLMOD_METIS_LIBRARY})
endif () endif ()
endif(CHOLMOD_LIBRARIES) endif()
if(CHOLMOD_LIBRARIES) if(CHOLMOD_LIBRARIES)
find_library(SUITESPARSE_LIBRARY SuiteSparse PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR}) find_library(SUITESPARSE_LIBRARY SuiteSparse PATHS ${CHOLMOD_LIBDIR} $ENV{CHOLMODDIR} ${LIB_INSTALL_DIR})
if (SUITESPARSE_LIBRARY) if (SUITESPARSE_LIBRARY)
set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${SUITESPARSE_LIBRARY}) set(CHOLMOD_LIBRARIES ${CHOLMOD_LIBRARIES} ${SUITESPARSE_LIBRARY})
endif (SUITESPARSE_LIBRARY) endif ()
endif(CHOLMOD_LIBRARIES) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CHOLMOD DEFAULT_MSG find_package_handle_standard_args(CHOLMOD DEFAULT_MSG

2
cmake/FindComputeCpp.cmake
View File

@ -263,4 +263,4 @@ function(add_sycl_to_target targetName binaryDir sourceFiles)
target_link_libraries(${targetName} PUBLIC ${COMPUTECPP_RUNTIME_LIBRARY} target_link_libraries(${targetName} PUBLIC ${COMPUTECPP_RUNTIME_LIBRARY}
PUBLIC ${OpenCL_LIBRARIES}) PUBLIC ${OpenCL_LIBRARIES})
endfunction(add_sycl_to_target) endfunction()

18
cmake/FindEigen2.cmake
View File

@ -17,16 +17,16 @@
if(NOT Eigen2_FIND_VERSION) if(NOT Eigen2_FIND_VERSION)
if(NOT Eigen2_FIND_VERSION_MAJOR) if(NOT Eigen2_FIND_VERSION_MAJOR)
set(Eigen2_FIND_VERSION_MAJOR 2) set(Eigen2_FIND_VERSION_MAJOR 2)
endif(NOT Eigen2_FIND_VERSION_MAJOR) endif()
if(NOT Eigen2_FIND_VERSION_MINOR) if(NOT Eigen2_FIND_VERSION_MINOR)
set(Eigen2_FIND_VERSION_MINOR 0) set(Eigen2_FIND_VERSION_MINOR 0)
endif(NOT Eigen2_FIND_VERSION_MINOR) endif()
if(NOT Eigen2_FIND_VERSION_PATCH) if(NOT Eigen2_FIND_VERSION_PATCH)
set(Eigen2_FIND_VERSION_PATCH 0) set(Eigen2_FIND_VERSION_PATCH 0)
endif(NOT Eigen2_FIND_VERSION_PATCH) endif()
set(Eigen2_FIND_VERSION "${Eigen2_FIND_VERSION_MAJOR}.${Eigen2_FIND_VERSION_MINOR}.${Eigen2_FIND_VERSION_PATCH}") set(Eigen2_FIND_VERSION "${Eigen2_FIND_VERSION_MAJOR}.${Eigen2_FIND_VERSION_MINOR}.${Eigen2_FIND_VERSION_PATCH}")
endif(NOT Eigen2_FIND_VERSION) endif()
macro(_eigen2_check_version) macro(_eigen2_check_version)
file(READ "${EIGEN2_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen2_version_header) file(READ "${EIGEN2_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen2_version_header)
@ -49,8 +49,8 @@ macro(_eigen2_check_version)
message(STATUS "Eigen2 version ${EIGEN2_VERSION} found in ${EIGEN2_INCLUDE_DIR}, " message(STATUS "Eigen2 version ${EIGEN2_VERSION} found in ${EIGEN2_INCLUDE_DIR}, "
"but at least version ${Eigen2_FIND_VERSION} is required") "but at least version ${Eigen2_FIND_VERSION} is required")
endif(NOT EIGEN2_VERSION_OK) endif()
endmacro(_eigen2_check_version) endmacro()
if (EIGEN2_INCLUDE_DIR) if (EIGEN2_INCLUDE_DIR)
@ -58,7 +58,7 @@ if (EIGEN2_INCLUDE_DIR)
_eigen2_check_version() _eigen2_check_version()
set(EIGEN2_FOUND ${EIGEN2_VERSION_OK}) set(EIGEN2_FOUND ${EIGEN2_VERSION_OK})
else (EIGEN2_INCLUDE_DIR) else ()
find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core
PATHS PATHS
@ -69,12 +69,12 @@ find_path(EIGEN2_INCLUDE_DIR NAMES Eigen/Core
if(EIGEN2_INCLUDE_DIR) if(EIGEN2_INCLUDE_DIR)
_eigen2_check_version() _eigen2_check_version()
endif(EIGEN2_INCLUDE_DIR) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Eigen2 DEFAULT_MSG EIGEN2_INCLUDE_DIR EIGEN2_VERSION_OK) find_package_handle_standard_args(Eigen2 DEFAULT_MSG EIGEN2_INCLUDE_DIR EIGEN2_VERSION_OK)
mark_as_advanced(EIGEN2_INCLUDE_DIR) mark_as_advanced(EIGEN2_INCLUDE_DIR)
endif(EIGEN2_INCLUDE_DIR) endif()

24
cmake/FindEigen3.cmake
View File

@ -28,16 +28,16 @@
if(NOT Eigen3_FIND_VERSION) if(NOT Eigen3_FIND_VERSION)
if(NOT Eigen3_FIND_VERSION_MAJOR) if(NOT Eigen3_FIND_VERSION_MAJOR)
set(Eigen3_FIND_VERSION_MAJOR 2) set(Eigen3_FIND_VERSION_MAJOR 2)
endif(NOT Eigen3_FIND_VERSION_MAJOR) endif()
if(NOT Eigen3_FIND_VERSION_MINOR) if(NOT Eigen3_FIND_VERSION_MINOR)
set(Eigen3_FIND_VERSION_MINOR 91) set(Eigen3_FIND_VERSION_MINOR 91)
endif(NOT Eigen3_FIND_VERSION_MINOR) endif()
if(NOT Eigen3_FIND_VERSION_PATCH) if(NOT Eigen3_FIND_VERSION_PATCH)
set(Eigen3_FIND_VERSION_PATCH 0) set(Eigen3_FIND_VERSION_PATCH 0)
endif(NOT Eigen3_FIND_VERSION_PATCH) endif()
set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
endif(NOT Eigen3_FIND_VERSION) endif()
macro(_eigen3_check_version) macro(_eigen3_check_version)
file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header) file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
@ -52,16 +52,16 @@ macro(_eigen3_check_version)
set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION}) set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
set(EIGEN3_VERSION_OK FALSE) set(EIGEN3_VERSION_OK FALSE)
else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) else()
set(EIGEN3_VERSION_OK TRUE) set(EIGEN3_VERSION_OK TRUE)
endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION}) endif()
if(NOT EIGEN3_VERSION_OK) if(NOT EIGEN3_VERSION_OK)
message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, " message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
"but at least version ${Eigen3_FIND_VERSION} is required") "but at least version ${Eigen3_FIND_VERSION} is required")
endif(NOT EIGEN3_VERSION_OK) endif()
endmacro(_eigen3_check_version) endmacro()
if (EIGEN3_INCLUDE_DIR) if (EIGEN3_INCLUDE_DIR)
@ -70,7 +70,7 @@ if (EIGEN3_INCLUDE_DIR)
set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
set(Eigen3_FOUND ${EIGEN3_VERSION_OK}) set(Eigen3_FOUND ${EIGEN3_VERSION_OK})
else (EIGEN3_INCLUDE_DIR) else ()
# search first if an Eigen3Config.cmake is available in the system, # search first if an Eigen3Config.cmake is available in the system,
# if successful this would set EIGEN3_INCLUDE_DIR and the rest of # if successful this would set EIGEN3_INCLUDE_DIR and the rest of
@ -87,18 +87,18 @@ else (EIGEN3_INCLUDE_DIR)
${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}
PATH_SUFFIXES eigen3 eigen PATH_SUFFIXES eigen3 eigen
) )
endif(NOT EIGEN3_INCLUDE_DIR) endif()
if(EIGEN3_INCLUDE_DIR) if(EIGEN3_INCLUDE_DIR)
_eigen3_check_version() _eigen3_check_version()
endif(EIGEN3_INCLUDE_DIR) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
mark_as_advanced(EIGEN3_INCLUDE_DIR) mark_as_advanced(EIGEN3_INCLUDE_DIR)
endif(EIGEN3_INCLUDE_DIR) endif()
if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen) if(EIGEN3_FOUND AND NOT TARGET Eigen3::Eigen)
add_library(Eigen3::Eigen INTERFACE IMPORTED) add_library(Eigen3::Eigen INTERFACE IMPORTED)

2
cmake/FindFFTW.cmake
View File

@ -101,7 +101,7 @@ else()
PATHS ${PKG_FFTW_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR} PATHS ${PKG_FFTW_INCLUDE_DIRS} ${INCLUDE_INSTALL_DIR}
) )
endif( FFTW_ROOT ) endif()
set(FFTW_LIBRARIES ${FFTW_LIB} ${FFTWF_LIB}) set(FFTW_LIBRARIES ${FFTW_LIB} ${FFTWF_LIB})

2
cmake/FindGMP.cmake
View File

@ -3,7 +3,7 @@
if (GMP_INCLUDES AND GMP_LIBRARIES) if (GMP_INCLUDES AND GMP_LIBRARIES)
set(GMP_FIND_QUIETLY TRUE) set(GMP_FIND_QUIETLY TRUE)
endif (GMP_INCLUDES AND GMP_LIBRARIES) endif ()
find_path(GMP_INCLUDES find_path(GMP_INCLUDES
NAMES NAMES

4
cmake/FindGSL.cmake
View File

@ -54,7 +54,7 @@ IF(WIN32)
PATHS ${GSL_POSSIBLE_ROOT_DIRS} PATHS ${GSL_POSSIBLE_ROOT_DIRS}
PATH_SUFFIXES lib PATH_SUFFIXES lib
DOC "GSL library") DOC "GSL library")
endif(NOT GSL_GSL_LIBRARY) endif()
FIND_LIBRARY(GSL_GSLCBLAS_LIBRARY FIND_LIBRARY(GSL_GSLCBLAS_LIBRARY
NAMES libgslcblas.dll.a gslcblas libgslcblas NAMES libgslcblas.dll.a gslcblas libgslcblas
@ -68,7 +68,7 @@ IF(WIN32)
PATHS ${GSL_POSSIBLE_ROOT_DIRS} PATHS ${GSL_POSSIBLE_ROOT_DIRS}
PATH_SUFFIXES lib PATH_SUFFIXES lib
DOC "GSL library") DOC "GSL library")
endif(NOT GSL_GSLCBLAS_LIBRARY) endif()
SET(GSL_LIBRARIES ${GSL_GSL_LIBRARY}) SET(GSL_LIBRARIES ${GSL_GSL_LIBRARY})

4
cmake/FindGoogleHash.cmake
View File

@ -1,7 +1,7 @@
if (GOOGLEHASH_INCLUDES AND GOOGLEHASH_LIBRARIES) if (GOOGLEHASH_INCLUDES AND GOOGLEHASH_LIBRARIES)
set(GOOGLEHASH_FIND_QUIETLY TRUE) set(GOOGLEHASH_FIND_QUIETLY TRUE)
endif (GOOGLEHASH_INCLUDES AND GOOGLEHASH_LIBRARIES) endif ()
find_path(GOOGLEHASH_INCLUDES find_path(GOOGLEHASH_INCLUDES
NAMES NAMES
@ -15,7 +15,7 @@ if(GOOGLEHASH_INCLUDES)
file(WRITE ${CMAKE_BINARY_DIR}/googlehash_test.cpp file(WRITE ${CMAKE_BINARY_DIR}/googlehash_test.cpp
"#include <google/sparse_hash_map>\n#include <google/dense_hash_map>\nint main(int argc, char** argv) { google::dense_hash_map<int,float> a; google::sparse_hash_map<int,float> b; return 0;}\n") "#include <google/sparse_hash_map>\n#include <google/dense_hash_map>\nint main(int argc, char** argv) { google::dense_hash_map<int,float> a; google::sparse_hash_map<int,float> b; return 0;}\n")
try_compile(GOOGLEHASH_COMPILE ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/googlehash_test.cpp OUTPUT_VARIABLE GOOGLEHASH_COMPILE_RESULT) try_compile(GOOGLEHASH_COMPILE ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/googlehash_test.cpp OUTPUT_VARIABLE GOOGLEHASH_COMPILE_RESULT)
endif(GOOGLEHASH_INCLUDES) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GOOGLEHASH DEFAULT_MSG GOOGLEHASH_INCLUDES GOOGLEHASH_COMPILE) find_package_handle_standard_args(GOOGLEHASH DEFAULT_MSG GOOGLEHASH_INCLUDES GOOGLEHASH_COMPILE)

6
cmake/FindHWLOC.cmake
View File

@ -85,7 +85,7 @@ if( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER )
endif() endif()
endif() endif()
endif( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER ) endif()
if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR (HWLOC_GIVEN_BY_USER) ) if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR (HWLOC_GIVEN_BY_USER) )
@ -282,9 +282,9 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) O
set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_FLAGS) set(CMAKE_REQUIRED_FLAGS)
set(CMAKE_REQUIRED_LIBRARIES) set(CMAKE_REQUIRED_LIBRARIES)
endif(HWLOC_LIBRARIES) endif()
endif( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR (HWLOC_GIVEN_BY_USER) ) endif()
if (HWLOC_LIBRARIES) if (HWLOC_LIBRARIES)
if (HWLOC_LIBRARY_DIRS) if (HWLOC_LIBRARY_DIRS)

6
cmake/FindKLU.cmake
View File

@ -3,7 +3,7 @@
if (KLU_INCLUDES AND KLU_LIBRARIES) if (KLU_INCLUDES AND KLU_LIBRARIES)
set(KLU_FIND_QUIETLY TRUE) set(KLU_FIND_QUIETLY TRUE)
endif (KLU_INCLUDES AND KLU_LIBRARIES) endif ()
find_path(KLU_INCLUDES find_path(KLU_INCLUDES
NAMES NAMES
@ -22,7 +22,7 @@ if(KLU_LIBRARIES)
if(NOT KLU_LIBDIR) if(NOT KLU_LIBDIR)
get_filename_component(KLU_LIBDIR ${KLU_LIBRARIES} PATH) get_filename_component(KLU_LIBDIR ${KLU_LIBRARIES} PATH)
endif(NOT KLU_LIBDIR) endif()
find_library(COLAMD_LIBRARY colamd PATHS ${KLU_LIBDIR} $ENV{KLUDIR} ${LIB_INSTALL_DIR}) find_library(COLAMD_LIBRARY colamd PATHS ${KLU_LIBDIR} $ENV{KLUDIR} ${LIB_INSTALL_DIR})
if(COLAMD_LIBRARY) if(COLAMD_LIBRARY)
@ -39,7 +39,7 @@ if(KLU_LIBRARIES)
set(KLU_LIBRARIES ${KLU_LIBRARIES} ${BTF_LIBRARY}) set(KLU_LIBRARIES ${KLU_LIBRARIES} ${BTF_LIBRARY})
endif() endif()
endif(KLU_LIBRARIES) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(KLU DEFAULT_MSG find_package_handle_standard_args(KLU DEFAULT_MSG

20
cmake/FindLAPACK.cmake
View File

@ -75,8 +75,8 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
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})
endif(_libraries_found) endif()
endforeach(_library ${_list}) endforeach()
if(_libraries_found) if(_libraries_found)
set(_libraries_found ${${LIBRARIES}}) set(_libraries_found ${${LIBRARIES}})
endif() endif()
@ -103,7 +103,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
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)
set(_libraries_work ${${_prefix}_${_name}_${_combined_name}_f2c_WORKS}) set(_libraries_work ${${_prefix}_${_name}_${_combined_name}_f2c_WORKS})
endif(_libraries_found AND NOT _libraries_work) endif()
# If not found, test this combination of libraries with a C interface. # If not found, test this combination of libraries with a C interface.
# A few implementations (ie ACML) provide a C interface. Unfortunately, there is no standard. # A few implementations (ie ACML) provide a C interface. Unfortunately, there is no standard.
@ -117,7 +117,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
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})
endif(_libraries_found AND NOT _libraries_work) endif()
# on failure # on failure
if(NOT _libraries_work) if(NOT _libraries_work)
@ -126,7 +126,7 @@ macro(check_lapack_libraries DEFINITIONS LIBRARIES _prefix _name _flags _list _b
endif() endif()
#message("DEBUG: ${DEFINITIONS} = ${${DEFINITIONS}}") #message("DEBUG: ${DEFINITIONS} = ${${DEFINITIONS}}")
#message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}") #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
endmacro(check_lapack_libraries) endmacro()
# #
@ -216,7 +216,7 @@ else()
"${BLAS_LIBRARIES}" "${BLAS_LIBRARIES}"
"${CGAL_TAUCS_LIBRARIES_DIR} ENV LAPACK_LIB_DIR" "${CGAL_TAUCS_LIBRARIES_DIR} ENV LAPACK_LIB_DIR"
) )
endif ( NOT LAPACK_LIBRARIES ) endif ()
# Generic LAPACK library? # Generic LAPACK library?
# This configuration *must* be the last try as this library is notably slow. # This configuration *must* be the last try as this library is notably slow.
@ -242,14 +242,14 @@ else()
if(NOT LAPACK_FIND_QUIETLY) if(NOT LAPACK_FIND_QUIETLY)
if(LAPACK_FOUND) if(LAPACK_FOUND)
message(STATUS "A library with LAPACK API found.") message(STATUS "A library with LAPACK API found.")
else(LAPACK_FOUND) else()
if(LAPACK_FIND_REQUIRED) if(LAPACK_FIND_REQUIRED)
message(FATAL_ERROR "A required library with LAPACK API not found. Please specify library location.") message(FATAL_ERROR "A required library with LAPACK API not found. Please specify library location.")
else() else()
message(STATUS "A library with LAPACK API not found. Please specify library location.") message(STATUS "A library with LAPACK API not found. Please specify library location.")
endif() endif()
endif(LAPACK_FOUND) endif()
endif(NOT LAPACK_FIND_QUIETLY) endif()
# Add variables to cache # Add variables to cache
set( LAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}" set( LAPACK_INCLUDE_DIR "${LAPACK_INCLUDE_DIR}"
@ -270,4 +270,4 @@ else()
#message("DEBUG: LAPACK_LIBRARIES_DIR = ${LAPACK_LIBRARIES_DIR}") #message("DEBUG: LAPACK_LIBRARIES_DIR = ${LAPACK_LIBRARIES_DIR}")
#message("DEBUG: LAPACK_FOUND = ${LAPACK_FOUND}") #message("DEBUG: LAPACK_FOUND = ${LAPACK_FOUND}")
endif(NOT BLAS_FOUND) endif()

14
cmake/FindMPFR.cmake
View File

@ -32,16 +32,16 @@ find_path(MPFR_INCLUDES
if(NOT MPFR_FIND_VERSION) if(NOT MPFR_FIND_VERSION)
if(NOT MPFR_FIND_VERSION_MAJOR) if(NOT MPFR_FIND_VERSION_MAJOR)
set(MPFR_FIND_VERSION_MAJOR 1) set(MPFR_FIND_VERSION_MAJOR 1)
endif(NOT MPFR_FIND_VERSION_MAJOR) endif()
if(NOT MPFR_FIND_VERSION_MINOR) if(NOT MPFR_FIND_VERSION_MINOR)
set(MPFR_FIND_VERSION_MINOR 0) set(MPFR_FIND_VERSION_MINOR 0)
endif(NOT MPFR_FIND_VERSION_MINOR) endif()
if(NOT MPFR_FIND_VERSION_PATCH) if(NOT MPFR_FIND_VERSION_PATCH)
set(MPFR_FIND_VERSION_PATCH 0) set(MPFR_FIND_VERSION_PATCH 0)
endif(NOT MPFR_FIND_VERSION_PATCH) endif()
set(MPFR_FIND_VERSION "${MPFR_FIND_VERSION_MAJOR}.${MPFR_FIND_VERSION_MINOR}.${MPFR_FIND_VERSION_PATCH}") set(MPFR_FIND_VERSION "${MPFR_FIND_VERSION_MAJOR}.${MPFR_FIND_VERSION_MINOR}.${MPFR_FIND_VERSION_PATCH}")
endif(NOT MPFR_FIND_VERSION) endif()
if(MPFR_INCLUDES) if(MPFR_INCLUDES)
@ -65,11 +65,11 @@ if(MPFR_INCLUDES)
set(MPFR_VERSION_OK FALSE) set(MPFR_VERSION_OK FALSE)
message(STATUS "MPFR version ${MPFR_VERSION} found in ${MPFR_INCLUDES}, " message(STATUS "MPFR version ${MPFR_VERSION} found in ${MPFR_INCLUDES}, "
"but at least version ${MPFR_FIND_VERSION} is required") "but at least version ${MPFR_FIND_VERSION} is required")
else(${MPFR_VERSION} VERSION_LESS ${MPFR_FIND_VERSION}) else()
set(MPFR_VERSION_OK TRUE) set(MPFR_VERSION_OK TRUE)
endif(${MPFR_VERSION} VERSION_LESS ${MPFR_FIND_VERSION}) endif()
endif(MPFR_INCLUDES) endif()
# Set MPFR_LIBRARIES # Set MPFR_LIBRARIES

2
cmake/FindMetis.cmake
View File

@ -238,7 +238,7 @@ if(METIS_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_FLAGS) set(CMAKE_REQUIRED_FLAGS)
set(CMAKE_REQUIRED_LIBRARIES) set(CMAKE_REQUIRED_LIBRARIES)
endif(METIS_LIBRARIES) endif()
if (METIS_LIBRARIES) if (METIS_LIBRARIES)
list(GET METIS_LIBRARIES 0 first_lib) list(GET METIS_LIBRARIES 0 first_lib)

2
cmake/FindPTSCOTCH.cmake
View File

@ -355,7 +355,7 @@ if(PTSCOTCH_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_FLAGS) set(CMAKE_REQUIRED_FLAGS)
set(CMAKE_REQUIRED_LIBRARIES) set(CMAKE_REQUIRED_LIBRARIES)
endif(PTSCOTCH_LIBRARIES) endif()
if (PTSCOTCH_LIBRARIES) if (PTSCOTCH_LIBRARIES)
list(GET PTSCOTCH_LIBRARIES 0 first_lib) list(GET PTSCOTCH_LIBRARIES 0 first_lib)

8
cmake/FindPastix.cmake
View File

@ -238,7 +238,7 @@ if (NOT MPI_FOUND AND PASTIX_LOOK_FOR_MPI)
mark_as_advanced(MPI_LIBRARY) mark_as_advanced(MPI_LIBRARY)
mark_as_advanced(MPI_EXTRA_LIBRARY) mark_as_advanced(MPI_EXTRA_LIBRARY)
endif() endif()
endif (NOT MPI_FOUND AND PASTIX_LOOK_FOR_MPI) endif ()
# PASTIX may depend on STARPU # PASTIX may depend on STARPU
#---------------------------- #----------------------------
@ -279,7 +279,7 @@ if( NOT STARPU_FOUND AND PASTIX_LOOK_FOR_STARPU)
COMPONENTS ${STARPU_COMPONENT_LIST}) COMPONENTS ${STARPU_COMPONENT_LIST})
endif() endif()
endif( NOT STARPU_FOUND AND PASTIX_LOOK_FOR_STARPU) endif()
# PASTIX may depends on SCOTCH # PASTIX may depends on SCOTCH
#----------------------------- #-----------------------------
@ -478,7 +478,7 @@ foreach(pastix_lib ${PASTIX_libs_to_find})
endif() endif()
mark_as_advanced(PASTIX_${pastix_lib}_LIBRARY) mark_as_advanced(PASTIX_${pastix_lib}_LIBRARY)
endforeach(pastix_lib ${PASTIX_libs_to_find}) endforeach()
# check a function to validate the find # check a function to validate the find
if(PASTIX_LIBRARIES) if(PASTIX_LIBRARIES)
@ -681,7 +681,7 @@ if(PASTIX_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_FLAGS) set(CMAKE_REQUIRED_FLAGS)
set(CMAKE_REQUIRED_LIBRARIES) set(CMAKE_REQUIRED_LIBRARIES)
endif(PASTIX_LIBRARIES) endif()
if (PASTIX_LIBRARIES) if (PASTIX_LIBRARIES)
list(GET PASTIX_LIBRARIES 0 first_lib) list(GET PASTIX_LIBRARIES 0 first_lib)

4
cmake/FindSPQR.cmake
View File

@ -6,7 +6,7 @@
if (SPQR_INCLUDES AND SPQR_LIBRARIES) if (SPQR_INCLUDES AND SPQR_LIBRARIES)
set(SPQR_FIND_QUIETLY TRUE) set(SPQR_FIND_QUIETLY TRUE)
endif (SPQR_INCLUDES AND SPQR_LIBRARIES) endif ()
find_path(SPQR_INCLUDES find_path(SPQR_INCLUDES
NAMES NAMES
@ -33,7 +33,7 @@ if(SPQR_LIBRARIES)
set(SPQR_LIBRARIES ${SPQR_LIBRARIES} ${CHOLMOD_LIBRARY}) set(SPQR_LIBRARIES ${SPQR_LIBRARIES} ${CHOLMOD_LIBRARY})
endif() endif()
endif(SPQR_LIBRARIES) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SPQR DEFAULT_MSG SPQR_INCLUDES SPQR_LIBRARIES) find_package_handle_standard_args(SPQR DEFAULT_MSG SPQR_INCLUDES SPQR_LIBRARIES)

2
cmake/FindScotch.cmake
View File

@ -301,7 +301,7 @@ if(SCOTCH_LIBRARIES)
set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_FLAGS) set(CMAKE_REQUIRED_FLAGS)
set(CMAKE_REQUIRED_LIBRARIES) set(CMAKE_REQUIRED_LIBRARIES)
endif(SCOTCH_LIBRARIES) endif()
if (SCOTCH_LIBRARIES) if (SCOTCH_LIBRARIES)
list(GET SCOTCH_LIBRARIES 0 first_lib) list(GET SCOTCH_LIBRARIES 0 first_lib)

2
cmake/FindSuperLU.cmake
View File

@ -4,7 +4,7 @@
if (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES) if (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES)
set(SUPERLU_FIND_QUIETLY TRUE) set(SUPERLU_FIND_QUIETLY TRUE)
endif (SUPERLU_INCLUDES AND SUPERLU_LIBRARIES) endif ()
find_path(SUPERLU_INCLUDES find_path(SUPERLU_INCLUDES
NAMES NAMES

6
cmake/FindTriSYCL.cmake
View File

@ -72,7 +72,7 @@ if(TRISYCL_OPENCL)
if(UNIX) if(UNIX)
set(BOOST_COMPUTE_INCPATH /usr/include/compute CACHE PATH set(BOOST_COMPUTE_INCPATH /usr/include/compute CACHE PATH
"Path to Boost.Compute headers (default is: /usr/include/compute)") "Path to Boost.Compute headers (default is: /usr/include/compute)")
endif(UNIX) endif()
endif() endif()
# Find OpenMP package # Find OpenMP package
@ -147,6 +147,6 @@ function(add_sycl_to_target targetName sourceFile binaryDir)
set_target_properties(${targetName} set_target_properties(${targetName}
PROPERTIES PROPERTIES
LINK_FLAGS ${OpenMP_CXX_FLAGS}) LINK_FLAGS ${OpenMP_CXX_FLAGS})
endif(${TRISYCL_OPENMP} AND (NOT WIN32)) endif()
endfunction(add_sycl_to_target) endfunction()

6
cmake/FindUmfpack.cmake
View File

@ -3,7 +3,7 @@
if (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES) if (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES)
set(UMFPACK_FIND_QUIETLY TRUE) set(UMFPACK_FIND_QUIETLY TRUE)
endif (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES) endif ()
find_path(UMFPACK_INCLUDES find_path(UMFPACK_INCLUDES
NAMES NAMES
@ -22,7 +22,7 @@ if(UMFPACK_LIBRARIES)
if(NOT UMFPACK_LIBDIR) if(NOT UMFPACK_LIBDIR)
get_filename_component(UMFPACK_LIBDIR ${UMFPACK_LIBRARIES} PATH) get_filename_component(UMFPACK_LIBDIR ${UMFPACK_LIBRARIES} PATH)
endif(NOT UMFPACK_LIBDIR) endif()
find_library(COLAMD_LIBRARY colamd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR}) find_library(COLAMD_LIBRARY colamd PATHS ${UMFPACK_LIBDIR} $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
if(COLAMD_LIBRARY) if(COLAMD_LIBRARY)
@ -44,7 +44,7 @@ if(UMFPACK_LIBRARIES)
set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${CHOLMOD_LIBRARY}) set(UMFPACK_LIBRARIES ${UMFPACK_LIBRARIES} ${CHOLMOD_LIBRARY})
endif() endif()
endif(UMFPACK_LIBRARIES) endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(UMFPACK DEFAULT_MSG find_package_handle_standard_args(UMFPACK DEFAULT_MSG

2
cmake/RegexUtils.cmake
View File

@ -15,5 +15,5 @@ function(test_escape_string_as_regex)
SET(testRef "\\\\\\.\\^\\$\\-\\+\\*\\(\\)\\[\\]\\?\\|") SET(testRef "\\\\\\.\\^\\$\\-\\+\\*\\(\\)\\[\\]\\?\\|")
if(NOT test2 STREQUAL testRef) if(NOT test2 STREQUAL testRef)
message("Error in the escape_string_for_regex function : \n ${test1} was escaped as ${test2}, should be ${testRef}") message("Error in the escape_string_for_regex function : \n ${test1} was escaped as ${test2}, should be ${testRef}")
endif(NOT test2 STREQUAL testRef) endif()
endfunction() endfunction()

10
cmake/language_support.cmake
View File

@ -51,13 +51,13 @@ function(workaround_9220 language language_works)
) )
if(return_code EQUAL 0) if(return_code EQUAL 0)
set(${language_works} ON PARENT_SCOPE) set(${language_works} ON PARENT_SCOPE)
else(return_code EQUAL 0) else()
set(${language_works} OFF PARENT_SCOPE) set(${language_works} OFF PARENT_SCOPE)
endif(return_code EQUAL 0) endif()
else(return_code EQUAL 0) else()
set(${language_works} OFF PARENT_SCOPE) set(${language_works} OFF PARENT_SCOPE)
endif(return_code EQUAL 0) endif()
endfunction(workaround_9220) endfunction()
# Temporary tests of the above function. # Temporary tests of the above function.
#workaround_9220(CXX CXX_language_works) #workaround_9220(CXX CXX_language_works)

4
demos/CMakeLists.txt
View File

@ -7,7 +7,7 @@ if(NOT EIGEN_TEST_NOQT)
if(QT4_FOUND) if(QT4_FOUND)
add_subdirectory(mandelbrot) add_subdirectory(mandelbrot)
add_subdirectory(opengl) add_subdirectory(opengl)
else(QT4_FOUND) else()
message(STATUS "Qt4 not found, so disabling the mandelbrot and opengl demos") message(STATUS "Qt4 not found, so disabling the mandelbrot and opengl demos")
endif(QT4_FOUND) endif()
endif() endif()

2
demos/mandelbrot/CMakeLists.txt
View File

@ -5,7 +5,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
add_definitions ( "-DNDEBUG" ) add_definitions ( "-DNDEBUG" )
endif (CMAKE_COMPILER_IS_GNUCXX) endif ()
include_directories( ${QT_INCLUDE_DIR} ) include_directories( ${QT_INCLUDE_DIR} )

8
doc/CMakeLists.txt
View File

@ -7,8 +7,8 @@ project(EigenDoc)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
if(CMAKE_SYSTEM_NAME MATCHES Linux) if(CMAKE_SYSTEM_NAME MATCHES Linux)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -g1") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -g1")
endif(CMAKE_SYSTEM_NAME MATCHES Linux) endif()
endif(CMAKE_COMPILER_IS_GNUCXX) endif()
# some examples and snippets needs c++11, so let's check it once # some examples and snippets needs c++11, so let's check it once
check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11) check_cxx_compiler_flag("-std=c++11" EIGEN_COMPILER_SUPPORT_CPP11)
@ -24,9 +24,9 @@ set(EIGEN_DOXY_HTML_COLORSTYLE_HUE "220")
set(EIGEN_DOXY_TAGFILES "") set(EIGEN_DOXY_TAGFILES "")
if(EIGEN_INTERNAL_DOCUMENTATION) if(EIGEN_INTERNAL_DOCUMENTATION)
set(EIGEN_DOXY_INTERNAL "YES") set(EIGEN_DOXY_INTERNAL "YES")
else(EIGEN_INTERNAL_DOCUMENTATION) else()
set(EIGEN_DOXY_INTERNAL "NO") set(EIGEN_DOXY_INTERNAL "NO")
endif(EIGEN_INTERNAL_DOCUMENTATION) endif()
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in

2
doc/examples/CMakeLists.txt
View File

@ -13,7 +13,7 @@ foreach(example_src ${examples_SRCS})
ARGS >${CMAKE_CURRENT_BINARY_DIR}/${example}.out ARGS >${CMAKE_CURRENT_BINARY_DIR}/${example}.out
) )
add_dependencies(all_examples ${example}) add_dependencies(all_examples ${example})
endforeach(example_src) endforeach()
if(EIGEN_COMPILER_SUPPORT_CPP11) if(EIGEN_COMPILER_SUPPORT_CPP11)
ei_add_target_property(nullary_indexing COMPILE_FLAGS "-std=c++11") ei_add_target_property(nullary_indexing COMPILE_FLAGS "-std=c++11")

2
doc/snippets/CMakeLists.txt
View File

@ -33,4 +33,4 @@ foreach(snippet_src ${snippets_SRCS})
else() else()
message("skip snippet ${snippet_src} because compiler does not support C++11") message("skip snippet ${snippet_src} because compiler does not support C++11")
endif() endif()
endforeach(snippet_src) endforeach()

4
doc/special_examples/CMakeLists.txt
View File

@ -3,7 +3,7 @@ if(NOT EIGEN_TEST_NOQT)
if(QT4_FOUND) if(QT4_FOUND)
include(${QT_USE_FILE}) include(${QT_USE_FILE})
endif() endif()
endif(NOT EIGEN_TEST_NOQT) endif()
if(QT4_FOUND) if(QT4_FOUND)
add_executable(Tutorial_sparse_example Tutorial_sparse_example.cpp Tutorial_sparse_example_details.cpp) add_executable(Tutorial_sparse_example Tutorial_sparse_example.cpp Tutorial_sparse_example_details.cpp)
@ -17,7 +17,7 @@ if(QT4_FOUND)
) )
add_dependencies(all_examples Tutorial_sparse_example) add_dependencies(all_examples Tutorial_sparse_example)
endif(QT4_FOUND) endif()
if(EIGEN_COMPILER_SUPPORT_CPP11) if(EIGEN_COMPILER_SUPPORT_CPP11)
add_executable(random_cpp11 random_cpp11.cpp) add_executable(random_cpp11 random_cpp11.cpp)

6
lapack/CMakeLists.txt
View File

@ -86,9 +86,9 @@ if(EIGEN_ENABLE_LAPACK_TESTS)
endif() endif()
endif(EIGEN_ENABLE_LAPACK_TESTS) endif()
endif(EIGEN_Fortran_COMPILER_WORKS) endif()
add_library(eigen_lapack_static ${EigenLapack_SRCS} ${ReferenceLapack_SRCS}) add_library(eigen_lapack_static ${EigenLapack_SRCS} ${ReferenceLapack_SRCS})
add_library(eigen_lapack SHARED ${EigenLapack_SRCS}) add_library(eigen_lapack SHARED ${EigenLapack_SRCS})
@ -152,7 +152,7 @@ if(EXISTS ${eigen_full_path_to_testing_lapack})
-DINTDIR=${CMAKE_CFG_INTDIR} -DINTDIR=${CMAKE_CFG_INTDIR}
-P "${LAPACK_SOURCE_DIR}/testing/runtest.cmake") -P "${LAPACK_SOURCE_DIR}/testing/runtest.cmake")
endif() endif()
endmacro(add_lapack_test) endmacro()
if (BUILD_SINGLE) if (BUILD_SINGLE)
add_lapack_test(stest.out stest.in xlintsts) add_lapack_test(stest.out stest.in xlintsts)

26
test/CMakeLists.txt
View File

@ -28,7 +28,7 @@ if(EIGEN_TEST_EXTERNAL_BLAS)
message(STATUS "BLAS_COMPILER_FLAGS: ${BLAS_COMPILER_FLAGS}") message(STATUS "BLAS_COMPILER_FLAGS: ${BLAS_COMPILER_FLAGS}")
add_definitions("-DEIGEN_USE_BLAS") # is adding ${BLAS_COMPILER_FLAGS} necessary? add_definitions("-DEIGEN_USE_BLAS") # is adding ${BLAS_COMPILER_FLAGS} necessary?
list(APPEND EXTERNAL_LIBS "${BLAS_LIBRARIES}") list(APPEND EXTERNAL_LIBS "${BLAS_LIBRARIES}")
endif(EIGEN_TEST_EXTERNAL_BLAS) endif()
# configure blas/lapack (use Eigen's ones) # configure blas/lapack (use Eigen's ones)
set(EIGEN_BLAS_LIBRARIES eigen_blas) set(EIGEN_BLAS_LIBRARIES eigen_blas)
@ -39,10 +39,10 @@ if(EIGEN_TEST_MATRIX_DIR)
if(NOT WIN32) if(NOT WIN32)
message(STATUS "Test realworld sparse matrices: ${EIGEN_TEST_MATRIX_DIR}") message(STATUS "Test realworld sparse matrices: ${EIGEN_TEST_MATRIX_DIR}")
add_definitions( -DTEST_REAL_CASES="${EIGEN_TEST_MATRIX_DIR}" ) add_definitions( -DTEST_REAL_CASES="${EIGEN_TEST_MATRIX_DIR}" )
else(NOT WIN32) else()
message(STATUS "REAL CASES CAN NOT BE CURRENTLY TESTED ON WIN32") message(STATUS "REAL CASES CAN NOT BE CURRENTLY TESTED ON WIN32")
endif(NOT WIN32) endif()
endif(EIGEN_TEST_MATRIX_DIR) endif()
set(SPARSE_LIBS " ") set(SPARSE_LIBS " ")
@ -110,9 +110,9 @@ if(PASTIX_FOUND AND PASTIX_pastix_nompi.h_INCLUDE_DIRS)
elseif(METIS_FOUND) elseif(METIS_FOUND)
include_directories(${METIS_INCLUDE_DIRS}) include_directories(${METIS_INCLUDE_DIRS})
set(PASTIX_LIBRARIES ${PASTIX_LIBRARIES} ${METIS_LIBRARIES}) set(PASTIX_LIBRARIES ${PASTIX_LIBRARIES} ${METIS_LIBRARIES})
else(SCOTCH_FOUND) else()
ei_add_property(EIGEN_MISSING_BACKENDS "PaStiX, ") ei_add_property(EIGEN_MISSING_BACKENDS "PaStiX, ")
endif(SCOTCH_FOUND) endif()
set(SPARSE_LIBS ${SPARSE_LIBS} ${PASTIX_LIBRARIES_DEP} ${ORDERING_LIBRARIES}) set(SPARSE_LIBS ${SPARSE_LIBS} ${PASTIX_LIBRARIES_DEP} ${ORDERING_LIBRARIES})
set(PASTIX_ALL_LIBS ${PASTIX_LIBRARIES_DEP}) set(PASTIX_ALL_LIBS ${PASTIX_LIBRARIES_DEP})
ei_add_property(EIGEN_TESTED_BACKENDS "PaStiX, ") ei_add_property(EIGEN_TESTED_BACKENDS "PaStiX, ")
@ -148,11 +148,11 @@ if(NOT EIGEN_TEST_NOQT)
else() else()
ei_add_property(EIGEN_MISSING_BACKENDS "Qt4 support, ") ei_add_property(EIGEN_MISSING_BACKENDS "Qt4 support, ")
endif() endif()
endif(NOT EIGEN_TEST_NOQT) endif()
if(TEST_LIB) if(TEST_LIB)
add_definitions("-DEIGEN_EXTERN_INSTANTIATIONS=1") add_definitions("-DEIGEN_EXTERN_INSTANTIATIONS=1")
endif(TEST_LIB) endif()
set_property(GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT "Official") set_property(GLOBAL PROPERTY EIGEN_CURRENT_SUBPROJECT "Official")
add_custom_target(BuildOfficial) add_custom_target(BuildOfficial)
@ -311,7 +311,7 @@ ei_add_test(fastmath " ${EIGEN_FASTMATH_FLAGS} ")
if(QT4_FOUND) if(QT4_FOUND)
ei_add_test(qtvector "" "${QT_QTCORE_LIBRARY}") ei_add_test(qtvector "" "${QT_QTCORE_LIBRARY}")
endif(QT4_FOUND) endif()
if(UMFPACK_FOUND) if(UMFPACK_FOUND)
ei_add_test(umfpack_support "" "${UMFPACK_ALL_LIBS}") ei_add_test(umfpack_support "" "${UMFPACK_ALL_LIBS}")
@ -405,9 +405,9 @@ if(CUDA_FOUND)
unset(EIGEN_ADD_TEST_FILENAME_EXTENSION) unset(EIGEN_ADD_TEST_FILENAME_EXTENSION)
endif(CUDA_FOUND) endif()
endif(EIGEN_TEST_CUDA) endif()
# HIP unit tests # HIP unit tests
@ -439,7 +439,7 @@ if (EIGEN_TEST_HIP)
message(FATAL_ERROR "Unknown HIP_PLATFORM = ${HIP_PLATFORM}") message(FATAL_ERROR "Unknown HIP_PLATFORM = ${HIP_PLATFORM}")
endif() endif()
endif(HIP_FOUND) endif()
else () else ()
@ -447,7 +447,7 @@ if (EIGEN_TEST_HIP)
endif() endif()
endif(EIGEN_TEST_HIP) endif()
option(EIGEN_TEST_BUILD_DOCUMENTATION "Test building the doxygen documentation" OFF) option(EIGEN_TEST_BUILD_DOCUMENTATION "Test building the doxygen documentation" OFF)
IF(EIGEN_TEST_BUILD_DOCUMENTATION) IF(EIGEN_TEST_BUILD_DOCUMENTATION)

18
unsupported/test/CMakeLists.txt
View File

@ -17,9 +17,9 @@ if(GOOGLEHASH_FOUND)
add_definitions("-DEIGEN_GOOGLEHASH_SUPPORT") add_definitions("-DEIGEN_GOOGLEHASH_SUPPORT")
include_directories(${GOOGLEHASH_INCLUDES}) include_directories(${GOOGLEHASH_INCLUDES})
ei_add_property(EIGEN_TESTED_BACKENDS "GoogleHash, ") ei_add_property(EIGEN_TESTED_BACKENDS "GoogleHash, ")
else(GOOGLEHASH_FOUND) else()
ei_add_property(EIGEN_MISSING_BACKENDS "GoogleHash, ") ei_add_property(EIGEN_MISSING_BACKENDS "GoogleHash, ")
endif(GOOGLEHASH_FOUND) endif()
find_package(Adolc) find_package(Adolc)
@ -31,9 +31,9 @@ if(ADOLC_FOUND)
else() else()
message(STATUS "Adolc found, but tests require C++11 mode") message(STATUS "Adolc found, but tests require C++11 mode")
endif() endif()
else(ADOLC_FOUND) else()
ei_add_property(EIGEN_MISSING_BACKENDS "Adolc, ") ei_add_property(EIGEN_MISSING_BACKENDS "Adolc, ")
endif(ADOLC_FOUND) endif()
# this test seems to never have been successful on x87, so is considered to contain a FP-related bug. # this test seems to never have been successful on x87, so is considered to contain a FP-related bug.
# see thread: "non-linear optimization test summary" # see thread: "non-linear optimization test summary"
@ -114,13 +114,13 @@ if(EIGEN_TEST_CXX11)
if(EIGEN_SYCL_TRISYCL) if(EIGEN_SYCL_TRISYCL)
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(STD_CXX_FLAG "-std=c++1z") set(STD_CXX_FLAG "-std=c++1z")
else(EIGEN_SYCL_TRISYCL) else()
# It should be safe to always run these tests as there is some fallback code for # It should be safe to always run these tests as there is some fallback code for
# older compiler that don't support cxx11. # older compiler that don't support cxx11.
# This is already set if EIGEN_TEST_CXX11 is enabled: # This is already set if EIGEN_TEST_CXX11 is enabled:
# set(CMAKE_CXX_STANDARD 11) # set(CMAKE_CXX_STANDARD 11)
# set(STD_CXX_FLAG "-std=c++11") # set(STD_CXX_FLAG "-std=c++11")
endif(EIGEN_SYCL_TRISYCL) endif()
ei_add_test_sycl(cxx11_tensor_sycl ${STD_CXX_FLAG}) ei_add_test_sycl(cxx11_tensor_sycl ${STD_CXX_FLAG})
ei_add_test_sycl(cxx11_tensor_forced_eval_sycl ${STD_CXX_FLAG}) ei_add_test_sycl(cxx11_tensor_forced_eval_sycl ${STD_CXX_FLAG})
@ -145,7 +145,7 @@ if(EIGEN_TEST_CXX11)
ei_add_test_sycl(cxx11_tensor_volume_patch_sycl ${STD_CXX_FLAG}) ei_add_test_sycl(cxx11_tensor_volume_patch_sycl ${STD_CXX_FLAG})
ei_add_test_sycl(cxx11_tensor_argmax_sycl ${STD_CXX_FLAG}) ei_add_test_sycl(cxx11_tensor_argmax_sycl ${STD_CXX_FLAG})
ei_add_test_sycl(cxx11_tensor_custom_op_sycl ${STD_CXX_FLAG}) ei_add_test_sycl(cxx11_tensor_custom_op_sycl ${STD_CXX_FLAG})
endif(EIGEN_TEST_SYCL) endif()
ei_add_test(cxx11_eventcount "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_eventcount "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
ei_add_test(cxx11_runqueue "-pthread" "${CMAKE_THREAD_LIBS_INIT}") ei_add_test(cxx11_runqueue "-pthread" "${CMAKE_THREAD_LIBS_INIT}")
@ -339,7 +339,7 @@ if (EIGEN_TEST_HIP)
message(FATAL_ERROR "Unknown HIP_PLATFORM = ${HIP_PLATFORM}") message(FATAL_ERROR "Unknown HIP_PLATFORM = ${HIP_PLATFORM}")
endif() endif()
endif(HIP_FOUND) endif()
else () else ()
@ -347,5 +347,5 @@ if (EIGEN_TEST_HIP)
endif() endif()
endif(EIGEN_TEST_HIP) endif()