This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via d20a9735cddbdceda3ee3122711feaab7cb74818 (commit)
via 551b4c90626357ee9b6048e89c7406f3b4063fbb (commit)
via 3a7be4f3943e160b1c0c144d914d3dd2ba42819e (commit)
from c758d6a57f6f8ee85be063b12123560fa4d174c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d20a9735cddbdceda3ee3122711feaab7cb74818
commit d20a9735cddbdceda3ee3122711feaab7cb74818
Merge: c758d6a 551b4c9
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Mon Aug 8 15:51:26 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 8 15:51:26 2016 -0400
Merge topic 'fix-string-append' into next
551b4c90 Revert the use of string(APPEND) in .cmake.in files
3a7be4f3 prefer list(APPEND) over string(APPEND) where appropriate
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=551b4c90626357ee9b6048e89c7406f3b4063fbb
commit 551b4c90626357ee9b6048e89c7406f3b4063fbb
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Mon Aug 8 21:45:41 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Mon Aug 8 21:45:41 2016 +0200
Revert the use of string(APPEND) in .cmake.in files
The generated files may be consumed by older cmake versions which do not
support string(APPEND).
diff --git a/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
b/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
index 3e8c511..bc78016 100644
--- a/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+++ b/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
@@ -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()
diff --git a/Modules/BasicConfigVersion-ExactVersion.cmake.in
b/Modules/BasicConfigVersion-ExactVersion.cmake.in
index 5741007..de4a23a 100644
--- a/Modules/BasicConfigVersion-ExactVersion.cmake.in
+++ b/Modules/BasicConfigVersion-ExactVersion.cmake.in
@@ -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()
diff --git a/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
b/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
index 0fad8a3..a32245d 100644
--- a/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+++ b/Modules/BasicConfigVersion-SameMajorVersion.cmake.in
@@ -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()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a7be4f3943e160b1c0c144d914d3dd2ba42819e
commit 3a7be4f3943e160b1c0c144d914d3dd2ba42819e
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Mon Aug 8 21:25:41 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Mon Aug 8 21:28:52 2016 +0200
prefer list(APPEND) over string(APPEND) where appropriate
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()
-----------------------------------------------------------------------
Summary of changes:
Modules/BasicConfigVersion-AnyNewerVersion.cmake.in | 2 +-
Modules/BasicConfigVersion-ExactVersion.cmake.in | 2 +-
Modules/BasicConfigVersion-SameMajorVersion.cmake.in | 2 +-
Modules/ExternalProject.cmake | 2 +-
Modules/FindQt4.cmake | 2 +-
Tests/RunCMake/CPack/VerifyResult.cmake | 4 ++--
Tests/SimpleInstall/CMakeLists.txt | 4 ++--
Tests/SimpleInstallS2/CMakeLists.txt | 4 ++--
8 files changed, 11 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
