diff options
| author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-08-08 19:25:41 (GMT) |
|---|---|---|
| committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2016-08-08 19:28:52 (GMT) |
| commit | 3a7be4f3943e160b1c0c144d914d3dd2ba42819e (patch) | |
| tree | aaf3674f3096264656031f80545880a69fa561b4 | |
| parent | ee9d4feb67f01686c270d3db584dfccaefd14b47 (diff) | |
| download | CMake-3a7be4f3943e160b1c0c144d914d3dd2ba42819e.zip CMake-3a7be4f3943e160b1c0c144d914d3dd2ba42819e.tar.gz CMake-3a7be4f3943e160b1c0c144d914d3dd2ba42819e.tar.bz2 | |
prefer list(APPEND) over string(APPEND) where appropriate
| -rw-r--r-- | Modules/ExternalProject.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindQt4.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/VerifyResult.cmake | 4 | ||||
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 44bf957..fc01976 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1133,7 +1133,7 @@ function(_ep_command_line_to_initial_cache var args force) endif() else() # Assume this is a list to append to the last var - string(APPEND accumulator ";${line}") + list(APPEND accumulator "${line}") endif() endforeach() # Catch the final line of the args diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index bf41ea1..7c41b99 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -764,7 +764,7 @@ if (QT_QMAKE_EXECUTABLE AND ############################################# cmake_push_check_state() # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES - string(APPEND CMAKE_REQUIRED_INCLUDES ";${QT_INCLUDE_DIR}") + list(APPEND CMAKE_REQUIRED_INCLUDES "${QT_INCLUDE_DIR}") set(CMAKE_REQUIRED_QUIET ${Qt4_FIND_QUIETLY}) # Check for Window system symbols (note: only one should end up being set) CHECK_CXX_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11) diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake index 8047668..074890f 100644 --- a/Tests/RunCMake/CPack/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/VerifyResult.cmake @@ -16,7 +16,7 @@ include("${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-ExpectedFiles.cmake") if(NOT EXPECTED_FILES_COUNT EQUAL 0) foreach(file_no_ RANGE 1 ${EXPECTED_FILES_COUNT}) file(GLOB FOUND_FILE_${file_no_} RELATIVE "${bin_dir}" "${EXPECTED_FILE_${file_no_}}") - string(APPEND foundFiles_ ";${FOUND_FILE_${file_no_}}") + list(APPEND foundFiles_ "${FOUND_FILE_${file_no_}}") list(LENGTH FOUND_FILE_${file_no_} foundFilesCount_) if(foundFilesCount_ EQUAL 1) @@ -45,7 +45,7 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0) # check that there were no extra files generated foreach(all_files_glob_ IN LISTS ALL_FILES_GLOB) file(GLOB foundAll_ RELATIVE "${bin_dir}" "${all_files_glob_}") - string(APPEND allFoundFiles_ ";${foundAll_}") + list(APPEND allFoundFiles_ "${foundAll_}") endforeach() list(LENGTH foundFiles_ foundFilesCount_) diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 5a1392b..4cf7355 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -348,7 +348,7 @@ if(UNIX AND NOT APPLE) # if(NOT SKIP_TZ) # message("compress found and it was not a script") # message("output from file command: [${output}]") - # string(APPEND CPACK_GENERATOR ";TZ") + # list(APPEND CPACK_GENERATOR "TZ") # else() # message("compress found, but it was a script so dont use it") # message("output from file command: [${output}]") @@ -357,7 +357,7 @@ if(UNIX AND NOT APPLE) find_program(found_bz2 NAMES bzip2) if(found_bz2) - string(APPEND CPACK_GENERATOR ";TBZ2") + list(APPEND CPACK_GENERATOR "TBZ2") endif() endif() diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 5a1392b..4cf7355 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -348,7 +348,7 @@ if(UNIX AND NOT APPLE) # if(NOT SKIP_TZ) # message("compress found and it was not a script") # message("output from file command: [${output}]") - # string(APPEND CPACK_GENERATOR ";TZ") + # list(APPEND CPACK_GENERATOR "TZ") # else() # message("compress found, but it was a script so dont use it") # message("output from file command: [${output}]") @@ -357,7 +357,7 @@ if(UNIX AND NOT APPLE) find_program(found_bz2 NAMES bzip2) if(found_bz2) - string(APPEND CPACK_GENERATOR ";TBZ2") + list(APPEND CPACK_GENERATOR "TBZ2") endif() endif() |