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 ab8daef62e29365988d595dd6bbf47fcd8aacc4e (commit)
via a85ee8b8cf4fb4be5f5ebd6e88e2753d1ec654ae (commit)
via da7155f5bc70440ccb1238e73194c2a454442f8d (commit)
from ddf17d549972cb0fa229f62915ebac916cff4ac0 (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=ab8daef62e29365988d595dd6bbf47fcd8aacc4e
commit ab8daef62e29365988d595dd6bbf47fcd8aacc4e
Merge: ddf17d5 a85ee8b
Author: Brad King <[email protected]>
AuthorDate: Tue Dec 16 10:12:56 2014 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Tue Dec 16 10:12:56 2014 -0500
Merge topic 'test-RunCMake-updates' into next
a85ee8b8 Tests: Simplify RunCMake test extra argument passing
da7155f5 Tests: Allow RunCMake tests to pass generator expressions
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a85ee8b8cf4fb4be5f5ebd6e88e2753d1ec654ae
commit a85ee8b8cf4fb4be5f5ebd6e88e2753d1ec654ae
Author: Brad King <[email protected]>
AuthorDate: Mon Dec 15 16:46:05 2014 -0500
Commit: Brad King <[email protected]>
CommitDate: Mon Dec 15 16:46:49 2014 -0500
Tests: Simplify RunCMake test extra argument passing
Allow add_RunCMake_test calls to pass non-optional arguments
immediately.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 4ec8feb..e74eadd 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -9,6 +9,7 @@ macro(add_RunCMake_test test)
-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
${${test}_ARGS}
+ ${ARGN}
-P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
)
endmacro()
@@ -131,8 +132,7 @@ if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION
VERSION_LESS 5.1.0)
add_RunCMake_test(IncompatibleQt)
endif()
if (QT4_FOUND)
- set(ObsoleteQtMacros_ARGS
-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
- add_RunCMake_test(ObsoleteQtMacros)
+ add_RunCMake_test(ObsoleteQtMacros
-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
endif()
find_package(PkgConfig QUIET)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da7155f5bc70440ccb1238e73194c2a454442f8d
commit da7155f5bc70440ccb1238e73194c2a454442f8d
Author: Brad King <[email protected]>
AuthorDate: Mon Dec 15 16:44:59 2014 -0500
Commit: Brad King <[email protected]>
CommitDate: Mon Dec 15 16:46:49 2014 -0500
Tests: Allow RunCMake tests to pass generator expressions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 2bfd4d6..4ec8feb 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -1,7 +1,7 @@
# See adjacent README.rst for documentation of this test infrastructure.
macro(add_RunCMake_test test)
- add_test(RunCMake.${test} ${CMAKE_CMAKE_COMMAND}
+ add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND}
-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
-DRunCMake_GENERATOR=${CMAKE_GENERATOR}
-DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
