From 03bbb54a9df198cf99390947c53eef320696fd83 Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 22 Oct 2012 12:40:16 +0000 Subject: [PATCH] Rename local variables to _, Part 2 git-svn-id: https://svn.dealii.org/branches/branch_cmake@27157 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/macros/macro_add_flags.cmake | 4 +- .../macros/macro_check_cxx_compiler_bug.cmake | 14 ++--- .../cmake/macros/macro_cond_set_to_yes.cmake | 8 +-- .../macros/macro_deal_ii_add_c_library.cmake | 20 +++---- .../macro_deal_ii_add_definitions.cmake | 12 ++-- .../macro_deal_ii_add_dependencies.cmake | 10 ++-- .../macros/macro_deal_ii_add_library.cmake | 20 +++---- .../macros/macro_deal_ii_setup_target.cmake | 28 +++++----- .../cmake/macros/macro_enable_if_links.cmake | 12 ++-- .../macros/macro_enable_if_supported.cmake | 10 ++-- .../macros/macro_expand_instantiations.cmake | 24 ++++---- .../macro_get_cxx_source_return_value.cmake | 55 ++++++++++--------- .../cmake/macros/macro_list_contains.cmake | 17 +++--- .../cmake/macros/macro_pop_test_flag.cmake | 2 +- .../cmake/macros/macro_push_test_flag.cmake | 4 +- deal.II/cmake/macros/macro_set_if_empty.cmake | 6 +- deal.II/cmake/macros/macro_strip_flag.cmake | 8 +-- deal.II/cmake/macros/macro_to_string.cmake | 10 ++-- .../macro_to_string_and_add_prefix.cmake | 10 ++-- 19 files changed, 138 insertions(+), 136 deletions(-) diff --git a/deal.II/cmake/macros/macro_add_flags.cmake b/deal.II/cmake/macros/macro_add_flags.cmake index d608abb602..b3d15f1b14 100644 --- a/deal.II/cmake/macros/macro_add_flags.cmake +++ b/deal.II/cmake/macros/macro_add_flags.cmake @@ -20,7 +20,7 @@ # ADD_FLAGS(variable flags) # -MACRO(ADD_FLAGS variable flags) - SET(${variable} "${${variable}} ${flags}") +MACRO(ADD_FLAGS _variable _flags) + SET(${_variable} "${${_variable}} ${_flags}") ENDMACRO() diff --git a/deal.II/cmake/macros/macro_check_cxx_compiler_bug.cmake b/deal.II/cmake/macros/macro_check_cxx_compiler_bug.cmake index 72556cb516..8a3ea412e0 100644 --- a/deal.II/cmake/macros/macro_check_cxx_compiler_bug.cmake +++ b/deal.II/cmake/macros/macro_check_cxx_compiler_bug.cmake @@ -23,16 +23,16 @@ # (This just inverts the logic of CHECK_CXX_SOURCE_COMPILES.) # -MACRO(CHECK_CXX_COMPILER_BUG source var) +MACRO(CHECK_CXX_COMPILER_BUG _source _var) CHECK_CXX_SOURCE_COMPILES( - "${source}" - ${var}_OK) + "${_source}" + ${_var}_OK) - IF(${var}_OK) - MESSAGE(STATUS "Test successful, do not define ${var}") + IF(${_var}_OK) + MESSAGE(STATUS "Test successful, do not define ${_var}") ELSE() - MESSAGE(STATUS "Test unsuccessful, define ${var}") - SET(${var} 1) + MESSAGE(STATUS "Test unsuccessful, define ${_var}") + SET(${_var} TRUE) ENDIF() ENDMACRO() diff --git a/deal.II/cmake/macros/macro_cond_set_to_yes.cmake b/deal.II/cmake/macros/macro_cond_set_to_yes.cmake index e6c0a9f43a..a0b6e40438 100644 --- a/deal.II/cmake/macros/macro_cond_set_to_yes.cmake +++ b/deal.II/cmake/macros/macro_cond_set_to_yes.cmake @@ -20,11 +20,11 @@ # COND_SET_TO_YES(bool variable) # -MACRO(COND_SET_TO_YES bool variable) - IF(${bool}) - SET(${variable} "yes") +MACRO(COND_SET_TO_YES _bool _variable) + IF(${_bool}) + SET(${_variable} "yes") ELSE() - SET(${variable} "no") + SET(${_variable} "no") ENDIF() ENDMACRO() diff --git a/deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake b/deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake index 110bb1a6f4..5b1600d1df 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_c_library.cmake @@ -16,24 +16,24 @@ # See macro_deal_ii_add_library.cmake for an explanation of this macro # -MACRO(DEAL_II_ADD_C_LIBRARY library) +MACRO(DEAL_II_ADD_C_LIBRARY _library) - FOREACH(build ${DEAL_II_BUILD_TYPES}) - STRING(TOLOWER ${build} build_lowercase) + FOREACH(_build ${DEAL_II_BUILD_TYPES}) + STRING(TOLOWER ${_build} _build_lowercase) - ADD_LIBRARY(${library}.${build_lowercase} + ADD_LIBRARY(${_library}.${_build_lowercase} ${ARGN} ) - SET_TARGET_PROPERTIES(${library}.${build_lowercase} PROPERTIES - LINK_FLAGS "${DEAL_II_SHARED_LINKER_FLAGS_${build}}" - COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${build}}" - COMPILE_FLAGS "${DEAL_II_C_FLAGS_${build}}" + SET_TARGET_PROPERTIES(${_library}.${_build_lowercase} PROPERTIES + LINK_FLAGS "${DEAL_II_SHARED_LINKER_FLAGS_${_build}}" + COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${_build}}" + COMPILE_FLAGS "${DEAL_II_C_FLAGS_${_build}}" ) FILE(APPEND - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/deal_ii_objects_${build_lowercase} - "$\n" + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/deal_ii_objects_${_build_lowercase} + "$\n" ) ENDFOREACH() diff --git a/deal.II/cmake/macros/macro_deal_ii_add_definitions.cmake b/deal.II/cmake/macros/macro_deal_ii_add_definitions.cmake index f88e91bd8a..b4f49ca1a8 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_definitions.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_definitions.cmake @@ -18,14 +18,14 @@ # to _add_ compile definitions to every target we have specified. # -MACRO(DEAL_II_ADD_DEFINITIONS name) +MACRO(DEAL_II_ADD_DEFINITIONS _name) - FOREACH(build ${DEAL_II_BUILD_TYPES}) - STRING(TOLOWER ${build} build_lowercase) + FOREACH(_build ${DEAL_II_BUILD_TYPES}) + STRING(TOLOWER ${_build} _build_lowercase) - GET_TARGET_PROPERTY(macro_definitions ${name}.${build_lowercase} COMPILE_DEFINITIONS) - SET_TARGET_PROPERTIES(${name}.${build_lowercase} PROPERTIES - COMPILE_DEFINITIONS "${ARGN};${macro_definitions}" + GET_TARGET_PROPERTY(_definitions ${_name}.${_build_lowercase} COMPILE_DEFINITIONS) + SET_TARGET_PROPERTIES(${_name}.${_build_lowercase} PROPERTIES + COMPILE_DEFINITIONS "${ARGN};${_macro_definitions}" ) ENDFOREACH() diff --git a/deal.II/cmake/macros/macro_deal_ii_add_dependencies.cmake b/deal.II/cmake/macros/macro_deal_ii_add_dependencies.cmake index 854cd0f25b..87ea359076 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_dependencies.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_dependencies.cmake @@ -18,12 +18,12 @@ # types specified in DEAL_II_BUILD_TYPES # -MACRO(DEAL_II_ADD_DEPENDENCIES name target) +MACRO(DEAL_II_ADD_DEPENDENCIES _name _target) - FOREACH(build ${DEAL_II_BUILD_TYPES}) - STRING(TOLOWER ${build} build_lowercase) - ADD_DEPENDENCIES(${name}.${build_lowercase} - ${target}.${build_lowercase} + FOREACH(_build ${DEAL_II_BUILD_TYPES}) + STRING(TOLOWER ${_build} _build_lowercase) + ADD_DEPENDENCIES(${_name}.${_build_lowercase} + ${_target}.${_build_lowercase} ) ENDFOREACH() diff --git a/deal.II/cmake/macros/macro_deal_ii_add_library.cmake b/deal.II/cmake/macros/macro_deal_ii_add_library.cmake index 367a5b05c4..e4b3fce705 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_library.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_library.cmake @@ -27,24 +27,24 @@ # DEAL_II_DEFINITIONS # -MACRO(DEAL_II_ADD_LIBRARY library) +MACRO(DEAL_II_ADD_LIBRARY _library) - FOREACH(build ${DEAL_II_BUILD_TYPES}) - STRING(TOLOWER ${build} build_lowercase) + FOREACH(_build ${DEAL_II_BUILD_TYPES}) + STRING(TOLOWER ${_build} _build_lowercase) - ADD_LIBRARY(${library}.${build_lowercase} + ADD_LIBRARY(${_library}.${_build_lowercase} ${ARGN} ) - SET_TARGET_PROPERTIES(${library}.${build_lowercase} PROPERTIES - LINK_FLAGS "${DEAL_II_SHARED_LINKER_FLAGS_${build}}" - COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${build}}" - COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${build}}" + SET_TARGET_PROPERTIES(${_library}.${_build_lowercase} PROPERTIES + LINK_FLAGS "${DEAL_II_SHARED_LINKER_FLAGS_${_build}}" + COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS};${DEAL_II_DEFINITIONS_${_build}}" + COMPILE_FLAGS "${DEAL_II_CXX_FLAGS_${_build}}" ) FILE(APPEND - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/deal_ii_objects_${build_lowercase} - "$\n" + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/deal_ii_objects_${_build_lowercase} + "$\n" ) ENDFOREACH() diff --git a/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake b/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake index f54f86105f..c942fe1a02 100644 --- a/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_setup_target.cmake @@ -24,7 +24,7 @@ # # -MACRO(DEAL_II_SETUP_TARGET target) +MACRO(DEAL_II_SETUP_TARGET _target) IF(NOT DEAL_II_PROJECT_CONFIG_INCLUDED) MESSAGE(FATAL_ERROR @@ -42,10 +42,10 @@ MACRO(DEAL_II_SETUP_TARGET target) # Necessary for setting INCLUDE_DIRECTORIES via SET_TARGET_PROPERTIES CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) - GET_DIRECTORY_PROPERTY(inc_dirs_so_far INCLUDE_DIRECTORIES) - SET_TARGET_PROPERTIES(${target} PROPERTIES + GET_DIRECTORY_PROPERTY(_inc_dirs_so_far INCLUDE_DIRECTORIES) + SET_TARGET_PROPERTIES(${_target} PROPERTIES INCLUDE_DIRECTORIES - "${inc_dirs_so_far};${DEAL_II_EXTERNAL_INCLUDE_DIRS};${DEAL_II_INCLUDE_DIRS}" + "${_inc_dirs_so_far};${DEAL_II_EXTERNAL_INCLUDE_DIRS};${DEAL_II_INCLUDE_DIRS}" LINK_FLAGS "${DEAL_II_LINKER_FLAGS}" COMPILE_DEFINITIONS @@ -55,12 +55,12 @@ MACRO(DEAL_II_SETUP_TARGET target) # # Set build type dependend flags and definitions: # - FOREACH(build ${DEAL_II_BUILD_TYPES}) - SET_TARGET_PROPERTIES(${target} PROPERTIES - LINK_FLAGS_${build} - "${DEAL_II_LINKER_FLAGS_${build}}" - COMPILE_DEFINITIONS_${build} - "${DEAL_II_USER_DEFINITIONS_${build}}" + FOREACH(_build ${DEAL_II_BUILD_TYPES}) + SET_TARGET_PROPERTIES(${_target} PROPERTIES + LINK_FLAGS_${_build} + "${DEAL_II_LINKER_FLAGS_${_build}}" + COMPILE_DEFINITIONS_${_build} + "${DEAL_II_USER_DEFINITIONS_${_build}}" ) ENDFOREACH() @@ -69,10 +69,10 @@ MACRO(DEAL_II_SETUP_TARGET target) # Link againgst the correct deal.II library target for the current # CMAKE_BUILD_TYPE: # - STRING(TOUPPER "${CMAKE_BUILD_TYPE}" build) - IF(NOT "${DEAL_II_TARGET_${build}}" STREQUAL "") - TARGET_LINK_LIBRARIES(${target} - ${DEAL_II_TARGET_${build}} + STRING(TOUPPER "${CMAKE_BUILD_TYPE}" _build) + IF(NOT "${DEAL_II_TARGET_${_build}}" STREQUAL "") + TARGET_LINK_LIBRARIES(${_target} + ${DEAL_II_TARGET_${_build}} ) ELSE() MESSAGE(FATAL_ERROR diff --git a/deal.II/cmake/macros/macro_enable_if_links.cmake b/deal.II/cmake/macros/macro_enable_if_links.cmake index 11298dc178..462dc7a400 100644 --- a/deal.II/cmake/macros/macro_enable_if_links.cmake +++ b/deal.II/cmake/macros/macro_enable_if_links.cmake @@ -21,17 +21,17 @@ # ENABLE_IF_LINKS(variable flag) # -MACRO(ENABLE_IF_LINKS variable flag) - ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${flag}") +MACRO(ENABLE_IF_LINKS _variable _flag) + ADD_FLAGS(CMAKE_REQUIRED_FLAGS "${_flag}") CHECK_CXX_SOURCE_COMPILES( " int main() { return 0; } " - DEAL_II_HAVE_FLAG_${flag} + DEAL_II_HAVE_FLAG_${_flag} ) - STRIP_FLAG(CMAKE_REQUIRED_FLAGS "${flag}") - IF(DEAL_II_HAVE_FLAG_${flag}) - SET(${variable} "${${variable}} ${flag}") + STRIP_FLAG(CMAKE_REQUIRED_FLAGS "${_flag}") + IF(DEAL_II_HAVE_FLAG_${_flag}) + SET(${_variable} "${${_variable}} ${_flag}") ENDIF() ENDMACRO() diff --git a/deal.II/cmake/macros/macro_enable_if_supported.cmake b/deal.II/cmake/macros/macro_enable_if_supported.cmake index a4711fc2af..80dbad5352 100644 --- a/deal.II/cmake/macros/macro_enable_if_supported.cmake +++ b/deal.II/cmake/macros/macro_enable_if_supported.cmake @@ -20,13 +20,13 @@ # ENABLE_IF_SUPPORTED(variable flag) # -MACRO(ENABLE_IF_SUPPORTED variable flag) +MACRO(ENABLE_IF_SUPPORTED _variable _flag) CHECK_CXX_COMPILER_FLAG( - "${flag}" - DEAL_II_HAVE_FLAG_${flag} + "${_flag}" + DEAL_II_HAVE_FLAG_${_flag} ) - IF(DEAL_II_HAVE_FLAG_${flag}) - SET(${variable} "${${variable}} ${flag}") + IF(DEAL_II_HAVE_FLAG_${_flag}) + SET(${_variable} "${${_variable}} ${_flag}") ENDIF() ENDMACRO() diff --git a/deal.II/cmake/macros/macro_expand_instantiations.cmake b/deal.II/cmake/macros/macro_expand_instantiations.cmake index 1fb904aca9..3f8da39c0e 100644 --- a/deal.II/cmake/macros/macro_expand_instantiations.cmake +++ b/deal.II/cmake/macros/macro_expand_instantiations.cmake @@ -31,36 +31,36 @@ # a list of inst.in files that will be expanded # -MACRO(EXPAND_INSTANTIATIONS target inst_in_files) - FOREACH (inst_in_file ${inst_in_files}) - STRING(REGEX REPLACE "\\.in$" "" inst_file "${inst_in_file}" ) +MACRO(EXPAND_INSTANTIATIONS _target _inst_in_files) + FOREACH (_inst_in_file ${_inst_in_files}) + STRING(REGEX REPLACE "\\.in$" "" _inst_file "${_inst_in_file}" ) ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${inst_file} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_inst_file} DEPENDS expand_instantiations - ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file} + ${CMAKE_CURRENT_SOURCE_DIR}/${_inst_in_file} COMMAND expand_instantiations ARGS ${CMAKE_BINARY_DIR}/config/template-arguments - < ${CMAKE_CURRENT_SOURCE_DIR}/${inst_in_file} - > ${CMAKE_CURRENT_BINARY_DIR}/${inst_file} + < ${CMAKE_CURRENT_SOURCE_DIR}/${_inst_in_file} + > ${CMAKE_CURRENT_BINARY_DIR}/${_inst_file} ) - LIST(APPEND inst_targets ${CMAKE_CURRENT_BINARY_DIR}/${inst_file}) + LIST(APPEND _inst_targets ${CMAKE_CURRENT_BINARY_DIR}/${_inst_file}) ENDFOREACH() # # Define a custom target that depends on the generation of all inst.in # files. # - ADD_CUSTOM_TARGET(${target}.inst ALL DEPENDS ${inst_targets}) + ADD_CUSTOM_TARGET(${_target}.inst ALL DEPENDS ${_inst_targets}) # # Add a dependency to all target.${build_type} so that target.inst is # fully generated before target will be processed. # - FOREACH(build ${DEAL_II_BUILD_TYPES}) - STRING(TOLOWER ${build} build_lowercase) - ADD_DEPENDENCIES(${target}.${build_lowercase} ${target}.inst) + FOREACH(_build ${DEAL_II_BUILD_TYPES}) + STRING(TOLOWER ${_build} _build_lowercase) + ADD_DEPENDENCIES(${_target}.${_build_lowercase} ${_target}.inst) ENDFOREACH() ENDMACRO() diff --git a/deal.II/cmake/macros/macro_get_cxx_source_return_value.cmake b/deal.II/cmake/macros/macro_get_cxx_source_return_value.cmake index 97cdb5e657..25b824ebab 100644 --- a/deal.II/cmake/macros/macro_get_cxx_source_return_value.cmake +++ b/deal.II/cmake/macros/macro_get_cxx_source_return_value.cmake @@ -15,44 +15,45 @@ # # TODO: Description... # -MACRO(GET_CXX_SOURCE_RETURN_VALUE SOURCE VAR EXIT_CODE) +MACRO(GET_CXX_SOURCE_RETURN_VALUE _source _var _exit_code) # # TODO: This file is still very basic :-] # - FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx" - "${SOURCE}\n") + IF(NOT DEFINED ${_var}) + FILE(WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx" + "${_source}\n") - MESSAGE(STATUS "Performing Test ${VAR}") + MESSAGE(STATUS "Performing Test ${_var}") - TRY_RUN( - ${VAR}_EXIT_CODE - ${VAR}_COMPILE_OK - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx) + TRY_RUN( + ${_var}_EXIT_CODE + ${_var}_COMPILE_OK + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/src.cxx) - IF(${VAR}_COMPILE_OK) - SET(${VAR} 1 CACHE INTERNAL "Test ${VAR}") - SET(${EXIT_CODE} ${VAR_EXIT_CODE} CACHE INTERNAL "Test ${EXIT_CODE}") - MESSAGE(STATUS "Performing Test ${VAR} - Success") + IF(${_var}_COMPILE_OK) + SET(${_var} 1 CACHE INTERNAL "Test ${_var}") + SET(${_exit_code} ${${_var}_EXIT_CODE} CACHE INTERNAL "Test ${_exit_code}") + MESSAGE(STATUS "Performing Test ${_var} - Success") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Performing C++ SOURCE FILE Test ${VAR} succeded with the following output:\n" - "${OUTPUT}\n" - "Return value: ${${VAR}}\n" - "Source file was:\n${SOURCE}\n") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log + "Performing C++ SOURCE FILE Test ${_var} succeded with the following output:\n" + "${OUTPUT}\n" + "Return value: ${${_var}}\n" + "Source file was:\n${_source}\n") - ELSE() + ELSE() - SET(${VAR} 0 CACHE INTERNAL "Test ${VAR}") - MESSAGE(STATUS "Performing Test ${VAR} - Failed") + SET(${_var} 0 CACHE INTERNAL "Test ${_var}") + MESSAGE(STATUS "Performing Test ${_var} - Failed") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Performing C++ SOURCE FILE Test ${VAR} failed with the following output:\n" - "${OUTPUT}\n" - "Return value: ${${VAR}_EXITCODE}\n" - "Source file was:\n${SOURCE}\n") + FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log + "Performing C++ SOURCE FILE Test ${_var} failed with the following output:\n" + "${OUTPUT}\n" + "Return value: ${${_var}_EXITCODE}\n" + "Source file was:\n${_source}\n") + ENDIF() ENDIF() - ENDMACRO() diff --git a/deal.II/cmake/macros/macro_list_contains.cmake b/deal.II/cmake/macros/macro_list_contains.cmake index 6cac2b8ddb..6449704785 100644 --- a/deal.II/cmake/macros/macro_list_contains.cmake +++ b/deal.II/cmake/macros/macro_list_contains.cmake @@ -22,12 +22,13 @@ # STREQUAL. # -MACRO(LIST_CONTAINS var value) - SET(${var}) - FOREACH (value2 ${ARGN}) - IF (${value} STREQUAL ${value2}) - SET(${var} TRUE) - ENDIF (${value} STREQUAL ${value2}) - ENDFOREACH (value2) -ENDMACRO(LIST_CONTAINS) +MACRO(LIST_CONTAINS _var _value) + SET(${_var}) + FOREACH (_value2 ${ARGN}) + IF("${_value}" STREQUAL "${_value2}") + SET(${_var} TRUE) + BREAK() + ENDIF() + ENDFOREACH() +ENDMACRO() diff --git a/deal.II/cmake/macros/macro_pop_test_flag.cmake b/deal.II/cmake/macros/macro_pop_test_flag.cmake index 730fa7fbef..c39529c40e 100644 --- a/deal.II/cmake/macros/macro_pop_test_flag.cmake +++ b/deal.II/cmake/macros/macro_pop_test_flag.cmake @@ -24,7 +24,7 @@ MACRO(POP_TEST_FLAG) SET(CMAKE_REQUIRED_FLAGS " ${CMAKE_REQUIRED_FLAGS}") - STRING(REGEX REPLACE " -[^ ]+$" "" + STRING(REGEX REPLACE " [^ ]+$" "" CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}" ) diff --git a/deal.II/cmake/macros/macro_push_test_flag.cmake b/deal.II/cmake/macros/macro_push_test_flag.cmake index ffabf77ebe..23f6f30f87 100644 --- a/deal.II/cmake/macros/macro_push_test_flag.cmake +++ b/deal.II/cmake/macros/macro_push_test_flag.cmake @@ -20,9 +20,9 @@ # PUSH_TEST_FLAG("flag") # -MACRO(PUSH_TEST_FLAG flag) +MACRO(PUSH_TEST_FLAG _flag) - SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${flag}") + SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${_flag}") STRING(STRIP "${CMAKE_REQUIRED_FLAGS}" CMAKE_REQUIRED_FLAGS) ENDMACRO() diff --git a/deal.II/cmake/macros/macro_set_if_empty.cmake b/deal.II/cmake/macros/macro_set_if_empty.cmake index 42341fd7a0..98031b0492 100644 --- a/deal.II/cmake/macros/macro_set_if_empty.cmake +++ b/deal.II/cmake/macros/macro_set_if_empty.cmake @@ -15,9 +15,9 @@ # # If 'variable' is empty it will be set to 'value' # -MACRO(SET_IF_EMPTY variable value) - IF("${${variable}}" STREQUAL "") - SET(${variable} ${value}) +MACRO(SET_IF_EMPTY _variable _value) + IF("${${_variable}}" STREQUAL "") + SET(${_variable} ${_value}) ENDIF() ENDMACRO() diff --git a/deal.II/cmake/macros/macro_strip_flag.cmake b/deal.II/cmake/macros/macro_strip_flag.cmake index 3de67d750d..26884197e2 100644 --- a/deal.II/cmake/macros/macro_strip_flag.cmake +++ b/deal.II/cmake/macros/macro_strip_flag.cmake @@ -19,9 +19,9 @@ # STRIP_FLAG(variable flag) # -MACRO(STRIP_FLAG variable flag) - SET(${variable} " ${${variable}}") - STRING(REPLACE " ${flag}" "" "${variable}" ${${variable}}) - STRING(STRIP "${${variable}}" ${variable}) +MACRO(STRIP_FLAG _variable _flag) + SET(${_variable} " ${${_variable}}") + STRING(REPLACE " ${_flag}" "" "${_variable}" ${${_variable}}) + STRING(STRIP "${${_variable}}" ${_variable}) ENDMACRO() diff --git a/deal.II/cmake/macros/macro_to_string.cmake b/deal.II/cmake/macros/macro_to_string.cmake index d9f33b84a3..7f52449d38 100644 --- a/deal.II/cmake/macros/macro_to_string.cmake +++ b/deal.II/cmake/macros/macro_to_string.cmake @@ -20,10 +20,10 @@ # TO_STRING(string ${list1} ${list2} ...) # -MACRO(TO_STRING variable) - SET(${variable} "") - FOREACH(var ${ARGN}) - SET(${variable} "${${variable}} ${var}") +MACRO(TO_STRING _variable) + SET(${_variable} "") + FOREACH(_var ${ARGN}) + SET(${_variable} "${${_variable}} ${_var}") ENDFOREACH() - STRING(STRIP "${${variable}}" ${variable}) + STRING(STRIP "${${_variable}}" ${_variable}) ENDMACRO() diff --git a/deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake b/deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake index bd4b3b89c3..8a7214f114 100644 --- a/deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake +++ b/deal.II/cmake/macros/macro_to_string_and_add_prefix.cmake @@ -21,10 +21,10 @@ # TO_STRING_AND_ADD_PREFIX(string "prefix" ${list1} ${list2} ...) # -MACRO(TO_STRING_AND_ADD_PREFIX variable prefix) - SET(${variable} "") - FOREACH(var ${ARGN}) - SET(${variable} "${${variable}} ${prefix}${var}") +MACRO(TO_STRING_AND_ADD_PREFIX _variable _prefix) + SET(${_variable} "") + FOREACH(_var ${ARGN}) + SET(${_variable} "${${_variable}} ${_prefix}${_var}") ENDFOREACH() - STRING(STRIP "${${variable}}" ${variable}) + STRING(STRIP "${${_variable}}" ${_variable}) ENDMACRO() -- 2.39.5