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.
This commit is contained in:
Hans Johnson
2019-10-31 11:36:37 -05:00
parent 6fb3e5f176
commit 8c8cab1afd
16 changed files with 209 additions and 209 deletions

View File

@@ -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}

View File

@@ -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

View File

@@ -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})
set (GLEW_LIBRARY ${GLEW_LIBRARIES})
set (GLEW_INCLUDE_PATH ${GLEW_INCLUDE_DIR})
ENDIF(GLEW_GLEW_LIBRARY)
ENDIF(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)
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(
mark_as_advanced(
GLEW_INCLUDE_DIR
GLEW_GLEW_LIBRARY
GLEW_Xmu_LIBRARY

View File

@@ -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*<endchar>"
# with <endchar> 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)

View File

@@ -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()

View File

@@ -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}")