Merge topic 'fix-string-append'
551b4c90
Revert the use of string(APPEND) in .cmake.in files3a7be4f3
prefer list(APPEND) over string(APPEND) where appropriate
This commit is contained in:
commit
4689d16e8a
|
@ -26,6 +26,6 @@ endif()
|
|||
# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
|
||||
if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
|
||||
math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
|
||||
string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
|
||||
set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
|
||||
set(PACKAGE_VERSION_UNSUITABLE TRUE)
|
||||
endif()
|
||||
|
|
|
@ -42,6 +42,6 @@ endif()
|
|||
# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
|
||||
if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
|
||||
math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
|
||||
string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
|
||||
set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
|
||||
set(PACKAGE_VERSION_UNSUITABLE TRUE)
|
||||
endif()
|
||||
|
|
|
@ -41,6 +41,6 @@ endif()
|
|||
# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
|
||||
if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
|
||||
math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
|
||||
string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
|
||||
set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
|
||||
set(PACKAGE_VERSION_UNSUITABLE TRUE)
|
||||
endif()
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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_)
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Reference in New Issue