[Cmake-commits] CMake branch, next, updated. v2.8.12-3778-gc242051
Stephen Kelly
steveire at gmail.com
Thu Oct 10 18:17:41 EDT 2013
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 c24205117647f00c9b7c0f6edc43a88c075b28ae (commit)
via ddf3bf2934010d3ff4573e9d2ca21edcf0046779 (commit)
via 2770e881879135b6755f2b264aab95a8e03f1344 (commit)
via 8c79369b9eaaae61aaab67a0585b74b4f9fde586 (commit)
via e31ed0d9cfa5d1535b72f6bad403f5ccad9660cc (commit)
via eeec796d8a637a68c09507542c4469448772226f (commit)
via 2e9693a73e60b84cc611afc43706894d6d4dc749 (commit)
from 4ff840d7d1c818d373a8e1cd7cc26ce2b0b537fc (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c24205117647f00c9b7c0f6edc43a88c075b28ae
commit c24205117647f00c9b7c0f6edc43a88c075b28ae
Merge: 4ff840d ddf3bf2
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 10 18:17:39 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 10 18:17:39 2013 -0400
Merge topic 'bump-required-cmake-version' into next
ddf3bf2 Unconditionally run the CTestTestRerunFailed test.
2770e88 Convert two macros to functions.
8c79369 Simplify condition for running testVisualStudioSlnParser test.
e31ed0d Use find_package(LibArchive) unconditionally.
eeec796 Simplify cmake_set_target_folder macro.
2e9693a Bump the minimum CMake version required to build CMake to 2.8.4.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ddf3bf2934010d3ff4573e9d2ca21edcf0046779
commit ddf3bf2934010d3ff4573e9d2ca21edcf0046779
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 11 00:10:50 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 11 00:11:51 2013 +0200
Unconditionally run the CTestTestRerunFailed test.
Remove check for CMake 2.8.4.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index bbac053..0e0455c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2160,15 +2160,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
set_tests_properties(CTestTestTimeout PROPERTIES
PASS_REGULAR_EXPRESSION "TestTimeout *\\.+ *\\*\\*\\*Timeout.*CheckChild *\\.+ *Passed")
- # this test only runs correctly if WORKING_DIRECTORY is honored.
- if (NOT CMAKE_VERSION VERSION_LESS "2.8.4")
- add_test(
- NAME CTestTestRerunFailed
- COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed)
- set_tests_properties(CTestTestRerunFailed PROPERTIES
- PASS_REGULAR_EXPRESSION "1/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout
- WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout)
- endif ()
+ add_test(
+ NAME CTestTestRerunFailed
+ COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed)
+ set_tests_properties(CTestTestRerunFailed PROPERTIES
+ PASS_REGULAR_EXPRESSION "1/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout
+ WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout)
configure_file(
"${CMake_SOURCE_DIR}/Tests/CTestTestZeroTimeout/test.cmake.in"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2770e881879135b6755f2b264aab95a8e03f1344
commit 2770e881879135b6755f2b264aab95a8e03f1344
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 11 00:09:30 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 11 00:11:51 2013 +0200
Convert two macros to functions.
As of CMake 2.8.0, functions are available and allow cleaner code
in some cases with configure_file.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index f7b98da..bbac053 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1985,12 +1985,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
"Process file.*foo.py.*Total LOC:.*13.*Percentage Coverage: 84.62.*"
ENVIRONMENT COVFILE=)
- # Use macro, not function so that build can still be driven by CMake 2.4.
- # After 2.6 is required, this could be a function without the extra 'set'
- # calls.
- #
- macro(add_config_tests cfg)
- set(cfg "${cfg}")
+ function(add_config_tests cfg)
set(base "${CMake_BINARY_DIR}/Tests/CTestConfig")
# Test -S script with a -C config arg to ctest:
@@ -2014,7 +2009,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
add_test(CTestConfig.Dashboard.${cfg} ${CMAKE_CMAKE_COMMAND}
-P "${base}/${cfg}-dashboard.cmake" -VV
)
- endmacro()
+ endfunction()
add_config_tests(Debug)
add_config_tests(MinSizeRel)
@@ -2234,20 +2229,11 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--output-log "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/testOutput.log"
)
- # Use macro, not function so that build can still be driven by CMake 2.4.
- # After 2.6 is required, this could be a function without the extra 'set'
- # calls.
- #
- macro(add_failed_submit_test name source build in out log regex)
- # Have variables named source, build and drop_method because the
- # configure_file call expects those variables to be defined.
- #
- set(source "${source}")
- set(build "${build}")
+ function(add_failed_submit_test name source build in out log regex)
configure_file("${in}" "${out}" @ONLY)
add_test(${name} ${CMAKE_CTEST_COMMAND} -S "${out}" -V --output-log "${log}")
set_tests_properties(${name} PROPERTIES PASS_REGULAR_EXPRESSION "${regex}")
- endmacro()
+ endfunction()
set(regex "(Problems when submitting via S*CP")
set(regex "${regex}|Error message was: ")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c79369b9eaaae61aaab67a0585b74b4f9fde586
commit 8c79369b9eaaae61aaab67a0585b74b4f9fde586
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 11 00:08:28 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 11 00:08:28 2013 +0200
Simplify condition for running testVisualStudioSlnParser test.
Remove check for UNIX, not needed as of CMake 2.8.4.
diff --git a/Tests/CMakeLib/CMakeLists.txt b/Tests/CMakeLib/CMakeLists.txt
index a831e30..070c9cc 100644
--- a/Tests/CMakeLib/CMakeLists.txt
+++ b/Tests/CMakeLib/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMakeLib_TESTS
testXMLSafe
)
-if(WIN32 AND NOT UNIX) # Just if(WIN32) when CMake >= 2.8.4 is required
+if(WIN32)
list(APPEND CMakeLib_TESTS
testVisualStudioSlnParser
)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e31ed0d9cfa5d1535b72f6bad403f5ccad9660cc
commit e31ed0d9cfa5d1535b72f6bad403f5ccad9660cc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 11 00:06:30 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 11 00:06:30 2013 +0200
Use find_package(LibArchive) unconditionally.
Remove check for CMake < 2.8.3.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ddbd47..5f3bc66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,11 +318,7 @@ macro (CMAKE_BUILD_UTILITIES)
#---------------------------------------------------------------------
# Build or use system libarchive for CMake and CTest.
if(CMAKE_USE_SYSTEM_LIBARCHIVE)
- if(EXISTS ${CMAKE_ROOT}/Modules/FindLibArchive.cmake) # added in 2.8.3
- find_package(LibArchive)
- else()
- include(${CMake_SOURCE_DIR}/Modules/FindLibArchive.cmake)
- endif()
+ find_package(LibArchive)
if(NOT LibArchive_FOUND)
message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is not found!")
endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eeec796d8a637a68c09507542c4469448772226f
commit eeec796d8a637a68c09507542c4469448772226f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 11 00:04:44 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 11 00:05:41 2013 +0200
Simplify cmake_set_target_folder macro.
Remove check for CMake < 2.8.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8d59a0..7ddbd47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,15 +195,8 @@ mark_as_advanced(CMAKE_USE_FOLDERS)
macro(CMAKE_SET_TARGET_FOLDER tgt folder)
if(CMAKE_USE_FOLDERS)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
- # Really, I just want this to be an "if(TARGET ${tgt})" ...
- # but I'm not sure that our min req'd., CMake 2.4.5 can handle
- # that... so I'm just activating this for now, with a version
- # compare, and only for MSVC builds.
- if(MSVC)
- if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.8)
- set_property(TARGET "${tgt}" PROPERTY FOLDER "${folder}")
- endif()
+ if(MSVC AND TARGET ${tgt})
+ set_property(TARGET "${tgt}" PROPERTY FOLDER "${folder}")
endif()
else()
set_property(GLOBAL PROPERTY USE_FOLDERS OFF)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e9693a73e60b84cc611afc43706894d6d4dc749
commit 2e9693a73e60b84cc611afc43706894d6d4dc749
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 11 00:02:24 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 11 00:02:24 2013 +0200
Bump the minimum CMake version required to build CMake to 2.8.4.
This allows the use of the $<TARGET_FILE:...> generator expression
as a replacement for the use of the LOCATION target property. The
use of the LOCATION target property is now deprecated for in-build
targets.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b64b6a9..a8d59a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,7 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
-cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
-set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
+cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
if(POLICY CMP0025)
cmake_policy(SET CMP0025 NEW)
endif()
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 20 ++++----------------
Tests/CMakeLib/CMakeLists.txt | 2 +-
Tests/CMakeLists.txt | 37 ++++++++++---------------------------
3 files changed, 15 insertions(+), 44 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list