From 8c8cab1afdc325dfe0a3c1ad805014ea4010e208 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Thu, 31 Oct 2019 11:36:37 -0500 Subject: STYLE: Convert CMake-language commands to lower case Ancient CMake versions required upper-case commands. Later command names became case-insensitive. Now the preferred style is lower-case. --- CTestConfig.cmake | 4 +- bench/btl/CMakeLists.txt | 54 ++++++------ .../btl/cmake/FindPackageHandleStandardArgs.cmake | 70 ++++++++-------- bench/btl/cmake/MacroOptionalAddSubdirectory.cmake | 30 +++---- bench/btl/data/CMakeLists.txt | 14 ++-- cmake/EigenTesting.cmake | 2 +- cmake/FindComputeCpp.cmake | 2 +- cmake/FindGLEW.cmake | 80 +++++++++--------- cmake/FindGSL.cmake | 96 +++++++++++----------- cmake/RegexUtils.cmake | 20 ++--- cmake/language_support.cmake | 2 +- lapack/CMakeLists.txt | 2 +- test/CMakeLists.txt | 4 +- unsupported/Eigen/src/EulerAngles/CMakeLists.txt | 4 +- unsupported/doc/examples/CMakeLists.txt | 18 ++-- unsupported/doc/snippets/CMakeLists.txt | 24 +++--- 16 files changed, 213 insertions(+), 213 deletions(-) diff --git a/CTestConfig.cmake b/CTestConfig.cmake index b68704559..0ea24b8e3 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -2,8 +2,8 @@ ## Then modify the CMakeLists.txt file in the root directory of your ## project to incorporate the testing dashboard. ## # The following are required to uses Dart and the Cdash dashboard -## ENABLE_TESTING() -## INCLUDE(CTest) +## enable_testing() +## include(CTest) set(CTEST_PROJECT_NAME "Eigen") set(CTEST_NIGHTLY_START_TIME "00:00:00 UTC") diff --git a/bench/btl/CMakeLists.txt b/bench/btl/CMakeLists.txt index f3a10d622..42094e867 100644 --- a/bench/btl/CMakeLists.txt +++ b/bench/btl/CMakeLists.txt @@ -1,30 +1,30 @@ -PROJECT(BTL) +project(BTL) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) +cmake_minimum_required(VERSION 2.6.2) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${Eigen_SOURCE_DIR}/cmake) include(MacroOptionalAddSubdirectory) -OPTION(BTL_NOVEC "Disable SSE/Altivec optimizations when possible" OFF) +option(BTL_NOVEC "Disable SSE/Altivec optimizations when possible" OFF) -SET(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) string(REGEX MATCH icpc IS_ICPC ${CMAKE_CXX_COMPILER}) -IF(CMAKE_COMPILER_IS_GNUCXX OR IS_ICPC) - SET(CMAKE_CXX_FLAGS "-g0 -O3 -DNDEBUG ${CMAKE_CXX_FLAGS}") - SET(CMAKE_Fortran_FLAGS "-g0 -O3 -DNDEBUG ${CMAKE_Fortran_FLAGS}") - IF(BTL_NOVEC) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_DONT_VECTORIZE") - ENDIF(BTL_NOVEC) -ENDIF(CMAKE_COMPILER_IS_GNUCXX OR IS_ICPC) - -IF(MSVC) - SET(CMAKE_CXX_FLAGS " /O2 /Ot /GL /fp:fast -DNDEBUG") -# SET(CMAKE_Fortran_FLAGS "-g0 -O3 -DNDEBUG") - IF(BTL_NOVEC) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_DONT_VECTORIZE") - ENDIF(BTL_NOVEC) -ENDIF(MSVC) +if(CMAKE_COMPILER_IS_GNUCXX OR IS_ICPC) + set(CMAKE_CXX_FLAGS "-g0 -O3 -DNDEBUG ${CMAKE_CXX_FLAGS}") + set(CMAKE_Fortran_FLAGS "-g0 -O3 -DNDEBUG ${CMAKE_Fortran_FLAGS}") + if(BTL_NOVEC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_DONT_VECTORIZE") + endif(BTL_NOVEC) +endif(CMAKE_COMPILER_IS_GNUCXX OR IS_ICPC) + +if(MSVC) + set(CMAKE_CXX_FLAGS " /O2 /Ot /GL /fp:fast -DNDEBUG") +# set(CMAKE_Fortran_FLAGS "-g0 -O3 -DNDEBUG") + if(BTL_NOVEC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_DONT_VECTORIZE") + endif(BTL_NOVEC) +endif(MSVC) if(IS_ICPC) set(CMAKE_CXX_FLAGS "-fast ${CMAKE_CXX_FLAGS}") @@ -49,7 +49,7 @@ if(NOT EIGEN_BTL_RT_LIBRARY) set(EIGEN_BTL_RT_LIBRARY "") endif() -MACRO(BTL_ADD_BENCH targetname) +macro(BTL_ADD_BENCH targetname) foreach(_current_var ${ARGN}) set(_last_var ${_current_var}) @@ -66,15 +66,15 @@ MACRO(BTL_ADD_BENCH targetname) set(_last_var ON) endif () - OPTION(BUILD_${targetname} "Build benchmark ${targetname}" ${_last_var}) + option(BUILD_${targetname} "Build benchmark ${targetname}" ${_last_var}) - IF(BUILD_${targetname}) - ADD_EXECUTABLE(${targetname} ${_sources}) - ADD_TEST(${targetname} "${targetname}") + if(BUILD_${targetname}) + add_executable(${targetname} ${_sources}) + add_test(${targetname} "${targetname}") target_link_libraries(${targetname} ${DEFAULT_LIBRARIES} ${EIGEN_BTL_RT_LIBRARY}) - ENDIF(BUILD_${targetname}) + endif(BUILD_${targetname}) -ENDMACRO(BTL_ADD_BENCH) +endmacro(BTL_ADD_BENCH) macro(btl_add_target_property target prop value) @@ -88,7 +88,7 @@ macro(btl_add_target_property target prop value) endmacro() -ENABLE_TESTING() +enable_testing() add_subdirectory(libs/eigen3) add_subdirectory(libs/eigen2) diff --git a/bench/btl/cmake/FindPackageHandleStandardArgs.cmake b/bench/btl/cmake/FindPackageHandleStandardArgs.cmake index 7f122edcd..05d7e65bd 100644 --- a/bench/btl/cmake/FindPackageHandleStandardArgs.cmake +++ b/bench/btl/cmake/FindPackageHandleStandardArgs.cmake @@ -1,7 +1,7 @@ # FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... ) # # This macro is intended to be used in FindXXX.cmake modules files. -# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and +# It handles the REQUIRED and QUIET argument to find_package() and # it also sets the _FOUND variable. # The package is found if all variables listed are TRUE. # Example: @@ -19,42 +19,42 @@ # be "Could NOT find LibXml2", if you don't like this message you can specify # your own custom failure message there. -MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) +macro(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) - IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") - IF (${_NAME}_FIND_REQUIRED) - SET(_FAIL_MESSAGE "Could not find REQUIRED package ${_NAME}") - ELSE (${_NAME}_FIND_REQUIRED) - SET(_FAIL_MESSAGE "Could not find OPTIONAL package ${_NAME}") - ENDIF (${_NAME}_FIND_REQUIRED) - ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") - SET(_FAIL_MESSAGE "${_FAIL_MSG}") - ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + if("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + if (${_NAME}_FIND_REQUIRED) + set(_FAIL_MESSAGE "Could not find REQUIRED package ${_NAME}") + else (${_NAME}_FIND_REQUIRED) + set(_FAIL_MESSAGE "Could not find OPTIONAL package ${_NAME}") + endif (${_NAME}_FIND_REQUIRED) + else("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + set(_FAIL_MESSAGE "${_FAIL_MSG}") + endif("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") - STRING(TOUPPER ${_NAME} _NAME_UPPER) + string(TOUPPER ${_NAME} _NAME_UPPER) - SET(${_NAME_UPPER}_FOUND TRUE) - IF(NOT ${_VAR1}) - SET(${_NAME_UPPER}_FOUND FALSE) - ENDIF(NOT ${_VAR1}) + set(${_NAME_UPPER}_FOUND TRUE) + if(NOT ${_VAR1}) + set(${_NAME_UPPER}_FOUND FALSE) + endif(NOT ${_VAR1}) - FOREACH(_CURRENT_VAR ${ARGN}) - IF(NOT ${_CURRENT_VAR}) - SET(${_NAME_UPPER}_FOUND FALSE) - ENDIF(NOT ${_CURRENT_VAR}) - ENDFOREACH(_CURRENT_VAR) + foreach(_CURRENT_VAR ${ARGN}) + if(NOT ${_CURRENT_VAR}) + set(${_NAME_UPPER}_FOUND FALSE) + endif(NOT ${_CURRENT_VAR}) + endforeach(_CURRENT_VAR) - IF (${_NAME_UPPER}_FOUND) - IF (NOT ${_NAME}_FIND_QUIETLY) - MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}") - ENDIF (NOT ${_NAME}_FIND_QUIETLY) - ELSE (${_NAME_UPPER}_FOUND) - IF (${_NAME}_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}") - ELSE (${_NAME}_FIND_REQUIRED) - IF (NOT ${_NAME}_FIND_QUIETLY) - MESSAGE(STATUS "${_FAIL_MESSAGE}") - ENDIF (NOT ${_NAME}_FIND_QUIETLY) - ENDIF (${_NAME}_FIND_REQUIRED) - ENDIF (${_NAME_UPPER}_FOUND) -ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS) + if (${_NAME_UPPER}_FOUND) + if (NOT ${_NAME}_FIND_QUIETLY) + message(STATUS "Found ${_NAME}: ${${_VAR1}}") + endif (NOT ${_NAME}_FIND_QUIETLY) + else (${_NAME_UPPER}_FOUND) + if (${_NAME}_FIND_REQUIRED) + message(FATAL_ERROR "${_FAIL_MESSAGE}") + else (${_NAME}_FIND_REQUIRED) + if (NOT ${_NAME}_FIND_QUIETLY) + message(STATUS "${_FAIL_MESSAGE}") + endif (NOT ${_NAME}_FIND_QUIETLY) + endif (${_NAME}_FIND_REQUIRED) + endif (${_NAME_UPPER}_FOUND) +endmacro(FIND_PACKAGE_HANDLE_STANDARD_ARGS) diff --git a/bench/btl/cmake/MacroOptionalAddSubdirectory.cmake b/bench/btl/cmake/MacroOptionalAddSubdirectory.cmake index 545048b68..8d46fcea2 100644 --- a/bench/btl/cmake/MacroOptionalAddSubdirectory.cmake +++ b/bench/btl/cmake/MacroOptionalAddSubdirectory.cmake @@ -1,6 +1,6 @@ -# - MACRO_OPTIONAL_ADD_SUBDIRECTORY() combines ADD_SUBDIRECTORY() with an OPTION() +# - MACRO_OPTIONAL_ADD_SUBDIRECTORY() combines add_subdirectory() with an option() # MACRO_OPTIONAL_ADD_SUBDIRECTORY( ) -# If you use MACRO_OPTIONAL_ADD_SUBDIRECTORY() instead of ADD_SUBDIRECTORY(), +# If you use MACRO_OPTIONAL_ADD_SUBDIRECTORY() instead of add_subdirectory(), # this will have two effects # 1 - CMake will not complain if the directory doesn't exist # This makes sense if you want to distribute just one of the subdirs @@ -16,16 +16,16 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -MACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY _dir ) - GET_FILENAME_COMPONENT(_fullPath ${_dir} ABSOLUTE) - IF(EXISTS ${_fullPath}) - IF(${ARGC} EQUAL 2) - OPTION(BUILD_${_dir} "Build directory ${_dir}" ${ARGV1}) - ELSE(${ARGC} EQUAL 2) - OPTION(BUILD_${_dir} "Build directory ${_dir}" TRUE) - ENDIF(${ARGC} EQUAL 2) - IF(BUILD_${_dir}) - ADD_SUBDIRECTORY(${_dir}) - ENDIF(BUILD_${_dir}) - ENDIF(EXISTS ${_fullPath}) -ENDMACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY) +macro (MACRO_OPTIONAL_ADD_SUBDIRECTORY _dir ) + get_filename_component(_fullPath ${_dir} ABSOLUTE) + if(EXISTS ${_fullPath}) + if(${ARGC} EQUAL 2) + option(BUILD_${_dir} "Build directory ${_dir}" ${ARGV1}) + else(${ARGC} EQUAL 2) + option(BUILD_${_dir} "Build directory ${_dir}" TRUE) + endif(${ARGC} EQUAL 2) + if(BUILD_${_dir}) + add_subdirectory(${_dir}) + endif(BUILD_${_dir}) + endif(EXISTS ${_fullPath}) +endmacro (MACRO_OPTIONAL_ADD_SUBDIRECTORY) diff --git a/bench/btl/data/CMakeLists.txt b/bench/btl/data/CMakeLists.txt index 6af2a366f..580c1ced0 100644 --- a/bench/btl/data/CMakeLists.txt +++ b/bench/btl/data/CMakeLists.txt @@ -1,25 +1,25 @@ -ADD_CUSTOM_TARGET(copy_scripts) +add_custom_target(copy_scripts) -SET(script_files go_mean mk_mean_script.sh mk_new_gnuplot.sh +set(script_files go_mean mk_mean_script.sh mk_new_gnuplot.sh perlib_plot_settings.txt action_settings.txt gnuplot_common_settings.hh ) -FOREACH(script_file ${script_files}) -ADD_CUSTOM_COMMAND( +foreach(script_file ${script_files}) +add_custom_command( TARGET copy_scripts POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${script_file} ${CMAKE_CURRENT_BINARY_DIR}/ ARGS ) -ENDFOREACH(script_file) +endforeach(script_file) -ADD_CUSTOM_COMMAND( +add_custom_command( TARGET copy_scripts POST_BUILD COMMAND ${CMAKE_CXX_COMPILER} --version | head -n 1 > ${CMAKE_CURRENT_BINARY_DIR}/compiler_version.txt ARGS ) -ADD_CUSTOM_COMMAND( +add_custom_command( TARGET copy_scripts POST_BUILD COMMAND echo "${Eigen_SOURCE_DIR}" > ${CMAKE_CURRENT_BINARY_DIR}/eigen_root_dir.txt diff --git a/cmake/EigenTesting.cmake b/cmake/EigenTesting.cmake index b810a1bc9..f8ffe2387 100644 --- a/cmake/EigenTesting.cmake +++ b/cmake/EigenTesting.cmake @@ -133,7 +133,7 @@ macro(ei_add_test_internal_sycl testname testname_with_suffix) if(NOT EIGEN_SYCL_TRISYCL) include_directories( SYSTEM ${COMPUTECPP_PACKAGE_ROOT_DIR}/include) - ADD_CUSTOM_COMMAND( + add_custom_command( OUTPUT ${include_file} COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${host_file}\\\"" > ${include_file} COMMAND ${CMAKE_COMMAND} -E echo "\\#include \\\"${bc_file}\\\"" >> ${include_file} diff --git a/cmake/FindComputeCpp.cmake b/cmake/FindComputeCpp.cmake index 103e8a19a..f84a2554d 100644 --- a/cmake/FindComputeCpp.cmake +++ b/cmake/FindComputeCpp.cmake @@ -256,7 +256,7 @@ function(add_sycl_to_target targetName binaryDir sourceFiles) # Add custom target to run compute++ and generate the integration header foreach(sourceFile ${sourceFiles}) __build_spir(${targetName} ${sourceFile} ${binaryDir} ${fileCounter}) - MATH(EXPR fileCounter "${fileCounter} + 1") + math(EXPR fileCounter "${fileCounter} + 1") endforeach() # Link with the ComputeCpp runtime library diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake index 54da20f12..9d486d5ba 100644 --- a/cmake/FindGLEW.cmake +++ b/cmake/FindGLEW.cmake @@ -10,47 +10,47 @@ # Also defined, but not for general use are: # GLEW_GLEW_LIBRARY = the full path to the glew library. -IF (WIN32) +if (WIN32) - IF(CYGWIN) + if(CYGWIN) - FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h) + find_path( GLEW_INCLUDE_DIR GL/glew.h) - FIND_LIBRARY( GLEW_GLEW_LIBRARY glew32 + find_library( GLEW_GLEW_LIBRARY glew32 ${OPENGL_LIBRARY_DIR} /usr/lib/w32api /usr/X11R6/lib ) - ELSE(CYGWIN) + else(CYGWIN) - FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h + find_path( GLEW_INCLUDE_DIR GL/glew.h $ENV{GLEW_ROOT_PATH}/include ) - FIND_LIBRARY( GLEW_GLEW_LIBRARY + find_library( GLEW_GLEW_LIBRARY NAMES glew glew32 PATHS $ENV{GLEW_ROOT_PATH}/lib ${OPENGL_LIBRARY_DIR} ) - ENDIF(CYGWIN) + endif(CYGWIN) -ELSE (WIN32) +else (WIN32) - IF (APPLE) + if (APPLE) # These values for Apple could probably do with improvement. - FIND_PATH( GLEW_INCLUDE_DIR glew.h + find_path( GLEW_INCLUDE_DIR glew.h /System/Library/Frameworks/GLEW.framework/Versions/A/Headers ${OPENGL_LIBRARY_DIR} ) - SET(GLEW_GLEW_LIBRARY "-framework GLEW" CACHE STRING "GLEW library for OSX") - SET(GLEW_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX") - ELSE (APPLE) + set(GLEW_GLEW_LIBRARY "-framework GLEW" CACHE STRING "GLEW library for OSX") + set(GLEW_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX") + else (APPLE) - FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h + find_path( GLEW_INCLUDE_DIR GL/glew.h /usr/include/GL /usr/openwin/share/include /usr/openwin/include @@ -60,44 +60,44 @@ ELSE (WIN32) /opt/graphics/OpenGL/contrib/libglew ) - FIND_LIBRARY( GLEW_GLEW_LIBRARY GLEW + find_library( GLEW_GLEW_LIBRARY GLEW /usr/openwin/lib /usr/X11R6/lib ) - ENDIF (APPLE) + endif (APPLE) -ENDIF (WIN32) +endif (WIN32) -SET( GLEW_FOUND "NO" ) -IF(GLEW_INCLUDE_DIR) - IF(GLEW_GLEW_LIBRARY) +set( GLEW_FOUND "NO" ) +if(GLEW_INCLUDE_DIR) + if(GLEW_GLEW_LIBRARY) # Is -lXi and -lXmu required on all platforms that have it? # If not, we need some way to figure out what platform we are on. - SET( GLEW_LIBRARIES + set( GLEW_LIBRARIES ${GLEW_GLEW_LIBRARY} ${GLEW_cocoa_LIBRARY} ) - SET( GLEW_FOUND "YES" ) + set( GLEW_FOUND "YES" ) #The following deprecated settings are for backwards compatibility with CMake1.4 - SET (GLEW_LIBRARY ${GLEW_LIBRARIES}) - SET (GLEW_INCLUDE_PATH ${GLEW_INCLUDE_DIR}) - - ENDIF(GLEW_GLEW_LIBRARY) -ENDIF(GLEW_INCLUDE_DIR) - -IF(GLEW_FOUND) - IF(NOT GLEW_FIND_QUIETLY) - MESSAGE(STATUS "Found Glew: ${GLEW_LIBRARIES}") - ENDIF(NOT GLEW_FIND_QUIETLY) -ELSE(GLEW_FOUND) - IF(GLEW_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find Glew") - ENDIF(GLEW_FIND_REQUIRED) -ENDIF(GLEW_FOUND) - -MARK_AS_ADVANCED( + set (GLEW_LIBRARY ${GLEW_LIBRARIES}) + set (GLEW_INCLUDE_PATH ${GLEW_INCLUDE_DIR}) + + endif(GLEW_GLEW_LIBRARY) +endif(GLEW_INCLUDE_DIR) + +if(GLEW_FOUND) + if(NOT GLEW_FIND_QUIETLY) + message(STATUS "Found Glew: ${GLEW_LIBRARIES}") + endif(NOT GLEW_FIND_QUIETLY) +else(GLEW_FOUND) + if(GLEW_FIND_REQUIRED) + message(FATAL_ERROR "Could not find Glew") + endif(GLEW_FIND_REQUIRED) +endif(GLEW_FOUND) + +mark_as_advanced( GLEW_INCLUDE_DIR GLEW_GLEW_LIBRARY GLEW_Xmu_LIBRARY diff --git a/cmake/FindGSL.cmake b/cmake/FindGSL.cmake index 10dc95340..8632232f9 100644 --- a/cmake/FindGSL.cmake +++ b/cmake/FindGSL.cmake @@ -23,9 +23,9 @@ # www.mip.informatik.uni-kiel.de # -------------------------------- -IF(WIN32) +if(WIN32) # JW tested with gsl-1.8, Windows XP, MSVS 7.1 - SET(GSL_POSSIBLE_ROOT_DIRS + set(GSL_POSSIBLE_ROOT_DIRS ${GSL_ROOT_DIR} $ENV{GSL_ROOT_DIR} ${GSL_DIR} @@ -35,136 +35,136 @@ IF(WIN32) $ENV{EXTRA} "C:/Program Files/GnuWin32" ) - FIND_PATH(GSL_INCLUDE_DIR + find_path(GSL_INCLUDE_DIR NAMES gsl/gsl_cdf.h gsl/gsl_randist.h PATHS ${GSL_POSSIBLE_ROOT_DIRS} PATH_SUFFIXES include DOC "GSL header include dir" ) - FIND_LIBRARY(GSL_GSL_LIBRARY + find_library(GSL_GSL_LIBRARY NAMES libgsl.dll.a gsl libgsl PATHS ${GSL_POSSIBLE_ROOT_DIRS} PATH_SUFFIXES lib DOC "GSL library" ) if(NOT GSL_GSL_LIBRARY) - FIND_FILE(GSL_GSL_LIBRARY + find_file(GSL_GSL_LIBRARY NAMES libgsl.dll.a PATHS ${GSL_POSSIBLE_ROOT_DIRS} PATH_SUFFIXES lib DOC "GSL library") endif() - FIND_LIBRARY(GSL_GSLCBLAS_LIBRARY + find_library(GSL_GSLCBLAS_LIBRARY NAMES libgslcblas.dll.a gslcblas libgslcblas PATHS ${GSL_POSSIBLE_ROOT_DIRS} PATH_SUFFIXES lib DOC "GSL cblas library dir" ) if(NOT GSL_GSLCBLAS_LIBRARY) - FIND_FILE(GSL_GSLCBLAS_LIBRARY + find_file(GSL_GSLCBLAS_LIBRARY NAMES libgslcblas.dll.a PATHS ${GSL_POSSIBLE_ROOT_DIRS} PATH_SUFFIXES lib DOC "GSL library") endif() - SET(GSL_LIBRARIES ${GSL_GSL_LIBRARY}) + set(GSL_LIBRARIES ${GSL_GSL_LIBRARY}) - #MESSAGE("DBG\n" + #message("DBG\n" # "GSL_GSL_LIBRARY=${GSL_GSL_LIBRARY}\n" # "GSL_GSLCBLAS_LIBRARY=${GSL_GSLCBLAS_LIBRARY}\n" # "GSL_LIBRARIES=${GSL_LIBRARIES}") -ELSE(WIN32) +else(WIN32) - IF(UNIX) - SET(GSL_CONFIG_PREFER_PATH + if(UNIX) + set(GSL_CONFIG_PREFER_PATH "$ENV{GSL_DIR}/bin" "$ENV{GSL_DIR}" "$ENV{GSL_HOME}/bin" "$ENV{GSL_HOME}" CACHE STRING "preferred path to GSL (gsl-config)") - FIND_PROGRAM(GSL_CONFIG gsl-config + find_program(GSL_CONFIG gsl-config ${GSL_CONFIG_PREFER_PATH} /usr/bin/ ) - # MESSAGE("DBG GSL_CONFIG ${GSL_CONFIG}") + # message("DBG GSL_CONFIG ${GSL_CONFIG}") - IF (GSL_CONFIG) + if (GSL_CONFIG) # set CXXFLAGS to be fed into CXX_FLAGS by the user: - SET(GSL_CXX_FLAGS "`${GSL_CONFIG} --cflags`") + set(GSL_CXX_FLAGS "`${GSL_CONFIG} --cflags`") # set INCLUDE_DIRS to prefix+include - EXEC_PROGRAM(${GSL_CONFIG} + exec_program(${GSL_CONFIG} ARGS --prefix OUTPUT_VARIABLE GSL_PREFIX) - SET(GSL_INCLUDE_DIR ${GSL_PREFIX}/include CACHE STRING INTERNAL) + set(GSL_INCLUDE_DIR ${GSL_PREFIX}/include CACHE STRING INTERNAL) # set link libraries and link flags - #SET(GSL_LIBRARIES "`${GSL_CONFIG} --libs`") - EXEC_PROGRAM(${GSL_CONFIG} + #set(GSL_LIBRARIES "`${GSL_CONFIG} --libs`") + exec_program(${GSL_CONFIG} ARGS --libs OUTPUT_VARIABLE GSL_LIBRARIES ) # extract link dirs for rpath - EXEC_PROGRAM(${GSL_CONFIG} + exec_program(${GSL_CONFIG} ARGS --libs OUTPUT_VARIABLE GSL_CONFIG_LIBS ) # extract version - EXEC_PROGRAM(${GSL_CONFIG} + exec_program(${GSL_CONFIG} ARGS --version OUTPUT_VARIABLE GSL_FULL_VERSION ) # split version as major/minor - STRING(REGEX MATCH "(.)\\..*" GSL_VERSION_MAJOR_ "${GSL_FULL_VERSION}") - SET(GSL_VERSION_MAJOR ${CMAKE_MATCH_1}) - STRING(REGEX MATCH ".\\.(.*)" GSL_VERSION_MINOR_ "${GSL_FULL_VERSION}") - SET(GSL_VERSION_MINOR ${CMAKE_MATCH_1}) + string(REGEX MATCH "(.)\\..*" GSL_VERSION_MAJOR_ "${GSL_FULL_VERSION}") + set(GSL_VERSION_MAJOR ${CMAKE_MATCH_1}) + string(REGEX MATCH ".\\.(.*)" GSL_VERSION_MINOR_ "${GSL_FULL_VERSION}") + set(GSL_VERSION_MINOR ${CMAKE_MATCH_1}) # split off the link dirs (for rpath) # use regular expression to match wildcard equivalent "-L*" # with is a space or a semicolon - STRING(REGEX MATCHALL "[-][L]([^ ;])+" + string(REGEX MATCHALL "[-][L]([^ ;])+" GSL_LINK_DIRECTORIES_WITH_PREFIX "${GSL_CONFIG_LIBS}" ) - # MESSAGE("DBG GSL_LINK_DIRECTORIES_WITH_PREFIX=${GSL_LINK_DIRECTORIES_WITH_PREFIX}") + # message("DBG GSL_LINK_DIRECTORIES_WITH_PREFIX=${GSL_LINK_DIRECTORIES_WITH_PREFIX}") # remove prefix -L because we need the pure directory for LINK_DIRECTORIES - IF (GSL_LINK_DIRECTORIES_WITH_PREFIX) - STRING(REGEX REPLACE "[-][L]" "" GSL_LINK_DIRECTORIES ${GSL_LINK_DIRECTORIES_WITH_PREFIX} ) - ENDIF (GSL_LINK_DIRECTORIES_WITH_PREFIX) - SET(GSL_EXE_LINKER_FLAGS "-Wl,-rpath,${GSL_LINK_DIRECTORIES}" CACHE STRING INTERNAL) - # MESSAGE("DBG GSL_LINK_DIRECTORIES=${GSL_LINK_DIRECTORIES}") - # MESSAGE("DBG GSL_EXE_LINKER_FLAGS=${GSL_EXE_LINKER_FLAGS}") + if (GSL_LINK_DIRECTORIES_WITH_PREFIX) + string(REGEX REPLACE "[-][L]" "" GSL_LINK_DIRECTORIES ${GSL_LINK_DIRECTORIES_WITH_PREFIX} ) + endif (GSL_LINK_DIRECTORIES_WITH_PREFIX) + set(GSL_EXE_LINKER_FLAGS "-Wl,-rpath,${GSL_LINK_DIRECTORIES}" CACHE STRING INTERNAL) + # message("DBG GSL_LINK_DIRECTORIES=${GSL_LINK_DIRECTORIES}") + # message("DBG GSL_EXE_LINKER_FLAGS=${GSL_EXE_LINKER_FLAGS}") - # ADD_DEFINITIONS("-DHAVE_GSL") - # SET(GSL_DEFINITIONS "-DHAVE_GSL") - MARK_AS_ADVANCED( + # add_definitions("-DHAVE_GSL") + # set(GSL_DEFINITIONS "-DHAVE_GSL") + mark_as_advanced( GSL_CXX_FLAGS GSL_INCLUDE_DIR GSL_LIBRARIES GSL_LINK_DIRECTORIES GSL_DEFINITIONS ) - MESSAGE(STATUS "Using GSL from ${GSL_PREFIX}") + message(STATUS "Using GSL from ${GSL_PREFIX}") - ELSE(GSL_CONFIG) - MESSAGE("FindGSL.cmake: gsl-config not found. Please set it manually. GSL_CONFIG=${GSL_CONFIG}") - ENDIF(GSL_CONFIG) + else(GSL_CONFIG) + message("FindGSL.cmake: gsl-config not found. Please set it manually. GSL_CONFIG=${GSL_CONFIG}") + endif(GSL_CONFIG) - ENDIF(UNIX) -ENDIF(WIN32) + endif(UNIX) +endif(WIN32) -IF(GSL_LIBRARIES) - IF(GSL_INCLUDE_DIR OR GSL_CXX_FLAGS) +if(GSL_LIBRARIES) + if(GSL_INCLUDE_DIR OR GSL_CXX_FLAGS) - SET(GSL_FOUND 1) + set(GSL_FOUND 1) - ENDIF(GSL_INCLUDE_DIR OR GSL_CXX_FLAGS) -ENDIF(GSL_LIBRARIES) + endif(GSL_INCLUDE_DIR OR GSL_CXX_FLAGS) +endif(GSL_LIBRARIES) diff --git a/cmake/RegexUtils.cmake b/cmake/RegexUtils.cmake index 73bed979a..f0a15248b 100644 --- a/cmake/RegexUtils.cmake +++ b/cmake/RegexUtils.cmake @@ -1,18 +1,18 @@ function(escape_string_as_regex _str_out _str_in) - STRING(REGEX REPLACE "\\\\" "\\\\\\\\" FILETEST2 "${_str_in}") - STRING(REGEX REPLACE "([.$+*?|-])" "\\\\\\1" FILETEST2 "${FILETEST2}") - STRING(REGEX REPLACE "\\^" "\\\\^" FILETEST2 "${FILETEST2}") - STRING(REGEX REPLACE "\\(" "\\\\(" FILETEST2 "${FILETEST2}") - STRING(REGEX REPLACE "\\)" "\\\\)" FILETEST2 "${FILETEST2}") - STRING(REGEX REPLACE "\\[" "\\\\[" FILETEST2 "${FILETEST2}") - STRING(REGEX REPLACE "\\]" "\\\\]" FILETEST2 "${FILETEST2}") - SET(${_str_out} "${FILETEST2}" PARENT_SCOPE) + string(REGEX REPLACE "\\\\" "\\\\\\\\" FILETEST2 "${_str_in}") + string(REGEX REPLACE "([.$+*?|-])" "\\\\\\1" FILETEST2 "${FILETEST2}") + string(REGEX REPLACE "\\^" "\\\\^" FILETEST2 "${FILETEST2}") + string(REGEX REPLACE "\\(" "\\\\(" FILETEST2 "${FILETEST2}") + string(REGEX REPLACE "\\)" "\\\\)" FILETEST2 "${FILETEST2}") + string(REGEX REPLACE "\\[" "\\\\[" FILETEST2 "${FILETEST2}") + string(REGEX REPLACE "\\]" "\\\\]" FILETEST2 "${FILETEST2}") + set(${_str_out} "${FILETEST2}" PARENT_SCOPE) endfunction() function(test_escape_string_as_regex) - SET(test1 "\\.^$-+*()[]?|") + set(test1 "\\.^$-+*()[]?|") escape_string_as_regex(test2 "${test1}") - SET(testRef "\\\\\\.\\^\\$\\-\\+\\*\\(\\)\\[\\]\\?\\|") + set(testRef "\\\\\\.\\^\\$\\-\\+\\*\\(\\)\\[\\]\\?\\|") if(NOT test2 STREQUAL testRef) message("Error in the escape_string_for_regex function : \n ${test1} was escaped as ${test2}, should be ${testRef}") endif() diff --git a/cmake/language_support.cmake b/cmake/language_support.cmake index 8e1baf624..20f80efd3 100644 --- a/cmake/language_support.cmake +++ b/cmake/language_support.cmake @@ -17,7 +17,7 @@ # CMakeLists.txt:3 (enable_language) # # My workaround is to invoke cmake twice. If both return codes are zero, -# it is safe to invoke ENABLE_LANGUAGE(Fortran OPTIONAL) +# it is safe to invoke enable_language(Fortran OPTIONAL) function(workaround_9220 language language_works) #message("DEBUG: language = ${language}") diff --git a/lapack/CMakeLists.txt b/lapack/CMakeLists.txt index baa21548f..0c50d5cd8 100644 --- a/lapack/CMakeLists.txt +++ b/lapack/CMakeLists.txt @@ -74,7 +74,7 @@ if(EIGEN_ENABLE_LAPACK_TESTS) sgetrf.f dgetrf.f cgetrf.f zgetrf.f sgetrs.f dgetrs.f cgetrs.f zgetrs.f) - FILE(GLOB ReferenceLapack_SRCS0 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "reference/*.f") + file(GLOB ReferenceLapack_SRCS0 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "reference/*.f") foreach(filename1 IN LISTS ReferenceLapack_SRCS0) string(REPLACE "reference/" "" filename ${filename1}) list(FIND EigenLapack_SRCS ${filename} id1) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index de274f38d..957d30c5f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -450,6 +450,6 @@ if (EIGEN_TEST_HIP) endif() option(EIGEN_TEST_BUILD_DOCUMENTATION "Test building the doxygen documentation" OFF) -IF(EIGEN_TEST_BUILD_DOCUMENTATION) +if(EIGEN_TEST_BUILD_DOCUMENTATION) add_dependencies(buildtests doc) -ENDIF() +endif() diff --git a/unsupported/Eigen/src/EulerAngles/CMakeLists.txt b/unsupported/Eigen/src/EulerAngles/CMakeLists.txt index 40af550e8..22088eb30 100644 --- a/unsupported/Eigen/src/EulerAngles/CMakeLists.txt +++ b/unsupported/Eigen/src/EulerAngles/CMakeLists.txt @@ -1,6 +1,6 @@ -FILE(GLOB Eigen_EulerAngles_SRCS "*.h") +file(GLOB Eigen_EulerAngles_SRCS "*.h") -INSTALL(FILES +install(FILES ${Eigen_EulerAngles_SRCS} DESTINATION ${INCLUDE_INSTALL_DIR}/unsupported/Eigen/src/EulerAngles COMPONENT Devel ) diff --git a/unsupported/doc/examples/CMakeLists.txt b/unsupported/doc/examples/CMakeLists.txt index c47646dfc..bee2b8ad4 100644 --- a/unsupported/doc/examples/CMakeLists.txt +++ b/unsupported/doc/examples/CMakeLists.txt @@ -1,20 +1,20 @@ -FILE(GLOB examples_SRCS "*.cpp") +file(GLOB examples_SRCS "*.cpp") -ADD_CUSTOM_TARGET(unsupported_examples) +add_custom_target(unsupported_examples) -INCLUDE_DIRECTORIES(../../../unsupported ../../../unsupported/test) +include_directories(../../../unsupported ../../../unsupported/test) -FOREACH(example_src ${examples_SRCS}) - GET_FILENAME_COMPONENT(example ${example_src} NAME_WE) - ADD_EXECUTABLE(example_${example} ${example_src}) +foreach(example_src ${examples_SRCS}) + get_filename_component(example ${example_src} NAME_WE) + add_executable(example_${example} ${example_src}) if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO) target_link_libraries(example_${example} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO}) endif() - ADD_CUSTOM_COMMAND( + add_custom_command( TARGET example_${example} POST_BUILD COMMAND example_${example} ARGS >${CMAKE_CURRENT_BINARY_DIR}/${example}.out ) - ADD_DEPENDENCIES(unsupported_examples example_${example}) -ENDFOREACH(example_src) + add_dependencies(unsupported_examples example_${example}) +endforeach(example_src) diff --git a/unsupported/doc/snippets/CMakeLists.txt b/unsupported/doc/snippets/CMakeLists.txt index f0c5cc2a8..adf95a8db 100644 --- a/unsupported/doc/snippets/CMakeLists.txt +++ b/unsupported/doc/snippets/CMakeLists.txt @@ -1,26 +1,26 @@ -FILE(GLOB snippets_SRCS "*.cpp") +file(GLOB snippets_SRCS "*.cpp") -ADD_CUSTOM_TARGET(unsupported_snippets) +add_custom_target(unsupported_snippets) -FOREACH(snippet_src ${snippets_SRCS}) - GET_FILENAME_COMPONENT(snippet ${snippet_src} NAME_WE) - SET(compile_snippet_target compile_${snippet}) - SET(compile_snippet_src ${compile_snippet_target}.cpp) - FILE(READ ${snippet_src} snippet_source_code) - CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/doc/snippets/compile_snippet.cpp.in +foreach(snippet_src ${snippets_SRCS}) + get_filename_component(snippet ${snippet_src} NAME_WE) + set(compile_snippet_target compile_${snippet}) + set(compile_snippet_src ${compile_snippet_target}.cpp) + file(READ ${snippet_src} snippet_source_code) + configure_file(${PROJECT_SOURCE_DIR}/doc/snippets/compile_snippet.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${compile_snippet_src}) - ADD_EXECUTABLE(${compile_snippet_target} + add_executable(${compile_snippet_target} ${CMAKE_CURRENT_BINARY_DIR}/${compile_snippet_src}) if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO) target_link_libraries(${compile_snippet_target} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO}) endif() - ADD_CUSTOM_COMMAND( + add_custom_command( TARGET ${compile_snippet_target} POST_BUILD COMMAND ${compile_snippet_target} ARGS >${CMAKE_CURRENT_BINARY_DIR}/${snippet}.out ) - ADD_DEPENDENCIES(unsupported_snippets ${compile_snippet_target}) + add_dependencies(unsupported_snippets ${compile_snippet_target}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${compile_snippet_src} PROPERTIES OBJECT_DEPENDS ${snippet_src}) -ENDFOREACH(snippet_src) +endforeach(snippet_src) -- cgit v1.2.3