diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-01 18:59:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-01 18:59:50 (GMT) |
| commit | 88e1c54a7cd3213d87143558a8fddf39e7fdccc0 (patch) | |
| tree | 3bb05b4e935ab00aa445129a073a6ff9321467af /Tests/RunCMake/CPack | |
| parent | bfac78d07479eb652405ee51548c4011766666ce (diff) | |
| parent | 7a649111cdea2b10f2ec57084416be619867fbfb (diff) | |
| download | CMake-88e1c54a7cd3213d87143558a8fddf39e7fdccc0.zip CMake-88e1c54a7cd3213d87143558a8fddf39e7fdccc0.tar.gz CMake-88e1c54a7cd3213d87143558a8fddf39e7fdccc0.tar.bz2 | |
Merge topic 'use-string-append'
7a649111 Use string(APPEND) in Tests
5d0d980d Use string(APPEND) in Modules
Diffstat (limited to 'Tests/RunCMake/CPack')
| -rw-r--r-- | Tests/RunCMake/CPack/DEB/Helpers.cmake | 10 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/VerifyResult.cmake | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Tests/RunCMake/CPack/DEB/Helpers.cmake b/Tests/RunCMake/CPack/DEB/Helpers.cmake index d05f115..9b1be22 100644 --- a/Tests/RunCMake/CPack/DEB/Helpers.cmake +++ b/Tests/RunCMake/CPack/DEB/Helpers.cmake @@ -40,13 +40,13 @@ function(getMissingShlibsErrorExtra FILE RESULT_VAR) set(error_extra " Extra: install files '${deb_install_files}'") if(deb_install_files_errors) - set(error_extra "${error_extra}; errors \"${deb_install_files_errors}\"") + string(APPEND error_extra "; errors \"${deb_install_files_errors}\"") endif() find_program(READELF_EXECUTABLE NAMES readelf) if(READELF_EXECUTABLE) - set(error_extra "${error_extra}; readelf \"\n") + string(APPEND error_extra "; readelf \"\n") # Only dynamically linked ELF files are included # Extract only file name infront of ":" @@ -61,13 +61,13 @@ function(getMissingShlibsErrorExtra FILE RESULT_VAR) ERROR_VARIABLE err_ OUTPUT_STRIP_TRAILING_WHITESPACE) - set(error_extra "${error_extra} name '${CMAKE_MATCH_1}'\n result '${result}'\n output '${output}'\n error '${err_}'\n") + string(APPEND error_extra " name '${CMAKE_MATCH_1}'\n result '${result}'\n output '${output}'\n error '${err_}'\n") endif() endforeach() - set(error_extra "${error_extra}\"") + string(APPEND error_extra "\"") else() - set(error_extra "${error_extra}; error readelf missing") + string(APPEND error_extra "; error readelf missing") endif() endif() diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake index 6eab531..8047668 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_}}") - set(foundFiles_ "${foundFiles_};${FOUND_FILE_${file_no_}}") + string(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_}") - set(allFoundFiles_ "${allFoundFiles_};${foundAll_}") + string(APPEND allFoundFiles_ ";${foundAll_}") endforeach() list(LENGTH foundFiles_ foundFilesCount_) |