dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 08:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use string(APPEND) in Modules

Browse Source 
Automate with:

find Modules -type f -print0 | xargs -0 perl -i -0pe \
  's/set\(([a-zA-Z0-9_\$\{\}]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
This commit is contained in:
Daniel Pfeifer
2017-05-17 11:23:34 -06:00
parent 3f25f873f8
commit 9e24af0137
13 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/CMakeCompilerIdDetection.cmake
View File

@@ -95,13 +95,13 @@ function(compiler_id_detection outvar lang)
if(CID_ID_DEFINE) if(CID_ID_DEFINE)
foreach(Id ${ordered_compilers}) foreach(Id ${ordered_compilers})
set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}# define ${CID_PREFIX}COMPILER_IS_${Id} 0\n") string(APPEND CMAKE_${lang}_COMPILER_ID_CONTENT "# define ${CID_PREFIX}COMPILER_IS_${Id} 0\n")
endforeach() endforeach()
endif() endif()
set(pp_if "#if") set(pp_if "#if")
if (CID_VERSION_STRINGS) if (CID_VERSION_STRINGS)
set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}\n/* Version number components: V=Version, R=Revision, P=Patch string(APPEND CMAKE_${lang}_COMPILER_ID_CONTENT "\n/* Version number components: V=Version, R=Revision, P=Patch
Version date components: YYYY=Year, MM=Month, DD=Day */\n") Version date components: YYYY=Year, MM=Month, DD=Day */\n")
endif() endif()
@@ -126,7 +126,7 @@ function(compiler_id_detection outvar lang)
string(CONFIGURE "${_compiler_id_version_compute_${Id}}" VERSION_BLOCK @ONLY) string(CONFIGURE "${_compiler_id_version_compute_${Id}}" VERSION_BLOCK @ONLY)
string(APPEND id_content "${VERSION_BLOCK}\n") string(APPEND id_content "${VERSION_BLOCK}\n")
endif() endif()
set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}\n${id_content}") string(APPEND CMAKE_${lang}_COMPILER_ID_CONTENT "\n${id_content}")
set(pp_if "#elif") set(pp_if "#elif")
endforeach() endforeach()
@@ -145,7 +145,7 @@ function(compiler_id_detection outvar lang)
# define ${CID_PREFIX}COMPILER_ID \"\"") # define ${CID_PREFIX}COMPILER_ID \"\"")
endif() endif()
set(CMAKE_${lang}_COMPILER_ID_CONTENT "${CMAKE_${lang}_COMPILER_ID_CONTENT}\n${platform_compiler_detection}\n#endif") string(APPEND CMAKE_${lang}_COMPILER_ID_CONTENT "\n${platform_compiler_detection}\n#endif")
endif() endif()
set(${outvar} ${CMAKE_${lang}_COMPILER_ID_CONTENT} PARENT_SCOPE) set(${outvar} ${CMAKE_${lang}_COMPILER_ID_CONTENT} PARENT_SCOPE)

10
Modules/CPackComponent.cmake
View File

@@ -309,11 +309,11 @@ set(CPackComponent_CMake_INCLUDED 1)
# configuration file. # configuration file.
macro(cpack_append_variable_set_command var strvar) macro(cpack_append_variable_set_command var strvar)
if (DEFINED ${var}) if (DEFINED ${var})
set(${strvar} "${${strvar}}set(${var}") string(APPEND ${strvar} "set(${var}")
foreach(APPENDVAL ${${var}}) foreach(APPENDVAL ${${var}})
set(${strvar} "${${strvar}} ${APPENDVAL}") string(APPEND ${strvar} " ${APPENDVAL}")
endforeach() endforeach()
set(${strvar} "${${strvar}})\n") string(APPEND ${strvar} ")\n")
endif () endif ()
endmacro() endmacro()
@@ -325,7 +325,7 @@ macro(cpack_append_string_variable_set_command var strvar)
if (DEFINED ${var}) if (DEFINED ${var})
list(LENGTH ${var} CPACK_APP_VALUE_LEN) list(LENGTH ${var} CPACK_APP_VALUE_LEN)
if(${CPACK_APP_VALUE_LEN} EQUAL 1) if(${CPACK_APP_VALUE_LEN} EQUAL 1)
set(${strvar} "${${strvar}}set(${var} \"${${var}}\")\n") string(APPEND ${strvar} "set(${var} \"${${var}}\")\n")
endif() endif()
endif () endif ()
endmacro() endmacro()
@@ -352,7 +352,7 @@ macro(cpack_append_option_set_command var strvar)
if (${var}) if (${var})
list(LENGTH ${var} CPACK_APP_VALUE_LEN) list(LENGTH ${var} CPACK_APP_VALUE_LEN)
if(${CPACK_APP_VALUE_LEN} EQUAL 1) if(${CPACK_APP_VALUE_LEN} EQUAL 1)
set(${strvar} "${${strvar}}set(${var} TRUE)\n") string(APPEND ${strvar} "set(${var} TRUE)\n")
endif() endif()
endif () endif ()
endmacro() endmacro()

4
Modules/CheckTypeSize.cmake
View File

@@ -247,10 +247,10 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
set(${VARIABLE}_CODE) set(${VARIABLE}_CODE)
set(_if if) set(_if if)
foreach(key ${${VARIABLE}_KEYS}) foreach(key ${${VARIABLE}_KEYS})
set(${VARIABLE}_CODE "${${VARIABLE}_CODE}#${_if} defined(${key})\n# define ${VARIABLE} ${${VARIABLE}-${key}}\n") string(APPEND ${VARIABLE}_CODE "#${_if} defined(${key})\n# define ${VARIABLE} ${${VARIABLE}-${key}}\n")
set(_if elif) set(_if elif)
endforeach() endforeach()
set(${VARIABLE}_CODE "${${VARIABLE}_CODE}#else\n# error ${VARIABLE} unknown\n#endif") string(APPEND ${VARIABLE}_CODE "#else\n# error ${VARIABLE} unknown\n#endif")
set(_if) set(_if)
elseif(${VARIABLE}) elseif(${VARIABLE})
set(${VARIABLE}_CODE "#define ${VARIABLE} ${${VARIABLE}}") set(${VARIABLE}_CODE "#define ${VARIABLE} ${${VARIABLE}}")

2
Modules/ExternalData.cmake
View File

@@ -1111,7 +1111,7 @@ if("${ExternalData_ACTION}" STREQUAL "fetch")
list(GET algo_list ${ii} algo) list(GET algo_list ${ii} algo)
_ExternalData_download_object("${name}" "${hash}" "${algo}" _ExternalData_download_object("${name}" "${hash}" "${algo}"
obj succeeded algoErrorMsg) obj succeeded algoErrorMsg)
set(errorMsg "${errorMsg}\n${algoErrorMsg}") string(APPEND errorMsg "\n${algoErrorMsg}")
if(succeeded) if(succeeded)
break() break()
endif() endif()

8
Modules/ExternalProject.cmake
View File

@@ -415,7 +415,7 @@ file(STRINGS "${CMAKE_CURRENT_LIST_FILE}" lines
foreach(line IN LISTS lines) foreach(line IN LISTS lines)
if("${line}" MATCHES "^\\.\\. command:: ([A-Za-z0-9_]+)") if("${line}" MATCHES "^\\.\\. command:: ([A-Za-z0-9_]+)")
if(_ep_func) if(_ep_func)
set(_ep_keywords_${_ep_func} "${_ep_keywords_${_ep_func}})$") string(APPEND _ep_keywords_${_ep_func} ")$")
endif() endif()
set(_ep_func "${CMAKE_MATCH_1}") set(_ep_func "${CMAKE_MATCH_1}")
#message("function [${_ep_func}]") #message("function [${_ep_func}]")
@@ -424,13 +424,13 @@ foreach(line IN LISTS lines)
elseif("${line}" MATCHES "^ ``([A-Z0-9_]+) .*``$") elseif("${line}" MATCHES "^ ``([A-Z0-9_]+) .*``$")
set(_ep_key "${CMAKE_MATCH_1}") set(_ep_key "${CMAKE_MATCH_1}")
#message(" keyword [${_ep_key}]") #message(" keyword [${_ep_key}]")
set(_ep_keywords_${_ep_func} string(APPEND _ep_keywords_${_ep_func}
"${_ep_keywords_${_ep_func}}${_ep_keyword_sep}${_ep_key}") "${_ep_keyword_sep}${_ep_key}")
set(_ep_keyword_sep "|") set(_ep_keyword_sep "|")
endif() endif()
endforeach() endforeach()
if(_ep_func) if(_ep_func)
set(_ep_keywords_${_ep_func} "${_ep_keywords_${_ep_func}})$") string(APPEND _ep_keywords_${_ep_func} ")$")
endif() endif()
# Save regex matching supported hash algorithm names. # Save regex matching supported hash algorithm names.

2
Modules/FindCUDA.cmake
View File

@@ -1825,7 +1825,7 @@ macro(cuda_compile_base cuda_target format generated_files)
else() else()
set(_counter 1) set(_counter 1)
endif() endif()
set(_cuda_target "${_cuda_target}_${_counter}") string(APPEND _cuda_target "_${_counter}")
set_property(DIRECTORY PROPERTY _cuda_internal_phony_counter ${_counter}) set_property(DIRECTORY PROPERTY _cuda_internal_phony_counter ${_counter})
# Separate the sources from the options # Separate the sources from the options

4
Modules/FindOpenGL.cmake
View File

@@ -178,7 +178,7 @@ if(OPENGL_FOUND)
if(OPENGL_gl_LIBRARY MATCHES "/([^/]+)\\.framework$") if(OPENGL_gl_LIBRARY MATCHES "/([^/]+)\\.framework$")
set(_gl_fw "${OPENGL_gl_LIBRARY}/${CMAKE_MATCH_1}") set(_gl_fw "${OPENGL_gl_LIBRARY}/${CMAKE_MATCH_1}")
if(EXISTS "${_gl_fw}.tbd") if(EXISTS "${_gl_fw}.tbd")
set(_gl_fw "${_gl_fw}.tbd") string(APPEND _gl_fw ".tbd")
endif() endif()
set_target_properties(OpenGL::GL PROPERTIES set_target_properties(OpenGL::GL PROPERTIES
IMPORTED_LOCATION "${_gl_fw}") IMPORTED_LOCATION "${_gl_fw}")
@@ -201,7 +201,7 @@ if(OPENGL_FOUND)
if(OPENGL_glu_LIBRARY MATCHES "/([^/]+)\\.framework$") if(OPENGL_glu_LIBRARY MATCHES "/([^/]+)\\.framework$")
set(_glu_fw "${OPENGL_glu_LIBRARY}/${CMAKE_MATCH_1}") set(_glu_fw "${OPENGL_glu_LIBRARY}/${CMAKE_MATCH_1}")
if(EXISTS "${_glu_fw}.tbd") if(EXISTS "${_glu_fw}.tbd")
set(_glu_fw "${_glu_fw}.tbd") string(APPEND _glu_fw ".tbd")
endif() endif()
set_target_properties(OpenGL::GLU PROPERTIES set_target_properties(OpenGL::GLU PROPERTIES
IMPORTED_LOCATION "${_glu_fw}") IMPORTED_LOCATION "${_glu_fw}")

2
Modules/Platform/AIX-GNU.cmake
View File

@@ -19,7 +19,7 @@ string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " -Wl,-brtl")
macro(__aix_compiler_gnu lang) macro(__aix_compiler_gnu lang)
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-blibpath:")
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-G,-bnoipath") string(APPEND CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS " -Wl,-G,-bnoipath")
set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-bexpall") set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-bexpall")
set(CMAKE_${lang}_USE_IMPLICIT_LINK_DIRECTORIES_IN_RUNTIME_PATH 1) set(CMAKE_${lang}_USE_IMPLICIT_LINK_DIRECTORIES_IN_RUNTIME_PATH 1)

2
Modules/Platform/CYGWIN-GNU.cmake
View File

@@ -40,7 +40,7 @@ macro(__cygwin_compiler_gnu lang)
set(CMAKE_EXE_EXPORTS_${lang}_FLAG "-Wl,--export-all-symbols") set(CMAKE_EXE_EXPORTS_${lang}_FLAG "-Wl,--export-all-symbols")
# TODO: Is -Wl,--enable-auto-import now always default? # TODO: Is -Wl,--enable-auto-import now always default?
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,--enable-auto-import") string(APPEND CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS " -Wl,--enable-auto-import")
set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS}") set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS}")
if(NOT CMAKE_RC_COMPILER_INIT) if(NOT CMAKE_RC_COMPILER_INIT)

2
Modules/Platform/HP-UX-GNU.cmake
View File

@@ -9,7 +9,7 @@ endif()
set(__HPUX_COMPILER_GNU 1) set(__HPUX_COMPILER_GNU 1)
macro(__hpux_compiler_gnu lang) macro(__hpux_compiler_gnu lang)
set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS} -Wl,-E,-b,+nodefaultrpath") string(APPEND CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS " -Wl,-E,-b,+nodefaultrpath")
set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-E") set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "-Wl,-E")
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,+b") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,+b")
set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":")

4
Modules/Platform/Windows-MSVC.cmake
View File

@@ -152,9 +152,9 @@ if(WINCE)
foreach(lang C CXX) foreach(lang C CXX)
if(_MSVC_${lang}_ARCHITECTURE_FAMILY STREQUAL "ARM") if(_MSVC_${lang}_ARCHITECTURE_FAMILY STREQUAL "ARM")
set(_PLATFORM_DEFINES_${lang} "${_PLATFORM_DEFINES_${lang}} /D${MSVC_${lang}_ARCHITECTURE_ID}") string(APPEND _PLATFORM_DEFINES_${lang} " /D${MSVC_${lang}_ARCHITECTURE_ID}")
if(MSVC_${lang}_ARCHITECTURE_ID MATCHES "^ARMV([45])I$") if(MSVC_${lang}_ARCHITECTURE_ID MATCHES "^ARMV([45])I$")
set(_FLAGS_${lang} "${_FLAGS_${lang}} /QRarch${CMAKE_MATCH_1}T") string(APPEND _FLAGS_${lang} " /QRarch${CMAKE_MATCH_1}T")
endif() endif()
endif() endif()
endforeach() endforeach()

2
Modules/UseJava.cmake
View File

@@ -417,7 +417,7 @@ endfunction ()
function(__java_lcat VAR) function(__java_lcat VAR)
foreach(_line ${ARGN}) foreach(_line ${ARGN})
set(${VAR} "${${VAR}}${_line}\n") string(APPEND ${VAR} "${_line}\n")
endforeach() endforeach()
set(${VAR} "${${VAR}}" PARENT_SCOPE) set(${VAR} "${${VAR}}" PARENT_SCOPE)

6
Modules/WriteCompilerDetectionHeader.cmake
View File

@@ -447,7 +447,7 @@ function(write_compiler_detection_header
endif() endif()
if(NOT _WCD_ALLOW_UNKNOWN_COMPILER_VERSIONS) if(NOT _WCD_ALLOW_UNKNOWN_COMPILER_VERSIONS)
set(${compiler_file_content} "${${compiler_file_content}} string(APPEND ${compiler_file_content} "
# if !(${_cmake_oldestSupported_${compiler}}) # if !(${_cmake_oldestSupported_${compiler}})
# error Unsupported compiler version # error Unsupported compiler version
# endif\n") # endif\n")
@@ -462,7 +462,7 @@ function(write_compiler_detection_header
set(MACRO_HEX) set(MACRO_HEX)
endif() endif()
string(CONFIGURE "${_compiler_id_version_compute_${compiler}}" VERSION_BLOCK @ONLY) string(CONFIGURE "${_compiler_id_version_compute_${compiler}}" VERSION_BLOCK @ONLY)
set(${compiler_file_content} "${${compiler_file_content}}${VERSION_BLOCK}\n") string(APPEND ${compiler_file_content} "${VERSION_BLOCK}\n")
set(PREFIX) set(PREFIX)
set(MACRO_DEC) set(MACRO_DEC)
set(MACRO_HEX) set(MACRO_HEX)
@@ -478,7 +478,7 @@ function(write_compiler_detection_header
set(_define_item "\n# define ${prefix_arg}_${feature_PP} 0\n") set(_define_item "\n# define ${prefix_arg}_${feature_PP} 0\n")
set(_define_item "\n# if ${_cmake_feature_test_${compiler}_${feature}}\n# define ${prefix_arg}_${feature_PP} 1\n# else${_define_item}# endif\n") set(_define_item "\n# if ${_cmake_feature_test_${compiler}_${feature}}\n# define ${prefix_arg}_${feature_PP} 1\n# else${_define_item}# endif\n")
endif() endif()
set(${compiler_file_content} "${${compiler_file_content}}${_define_item}") string(APPEND ${compiler_file_content} "${_define_item}")
endforeach() endforeach()
endforeach() endforeach()
if(pp_if STREQUAL "elif") if(pp_if STREQUAL "elif")