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. --- bench/btl/CMakeLists.txt | 54 ++++++++--------- .../btl/cmake/FindPackageHandleStandardArgs.cmake | 70 +++++++++++----------- bench/btl/cmake/MacroOptionalAddSubdirectory.cmake | 30 +++++----- bench/btl/data/CMakeLists.txt | 14 ++--- 4 files changed, 84 insertions(+), 84 deletions(-) (limited to 'bench') 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 -- cgit v1.2.3