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 7931816712d28e4429475c2adfc503612812b25b (commit)
via fe21ccc4860d38bdb80f4dc8a0785661484e7024 (commit)
from e6f1d0366f459cfe51a7f855c26530502954ca35 (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=7931816712d28e4429475c2adfc503612812b25b
commit 7931816712d28e4429475c2adfc503612812b25b
Merge: e6f1d03 fe21ccc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 3 20:04:37 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 3 16:04:39 2017 -0400
Stage topic 'test-CMakeOnly.AllFindModules-local-exclude'
Topic-id: 23466
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/661
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe21ccc4860d38bdb80f4dc8a0785661484e7024
commit fe21ccc4860d38bdb80f4dc8a0785661484e7024
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 3 15:38:26 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 3 16:04:17 2017 -0400
Tests: Optionally skip local packages versions in CMakeOnly.AllFindModules
Some machines have incomplete or otherwise broken installations of
specific packages. Allow local configuration to prevent the test from
failing on such packages if the version number cannot be extracted.
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 8f842d6..7eb679c 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -56,7 +56,10 @@ if (NOT QT4_FOUND)
endif ()
macro(check_version_string MODULE_NAME VERSION_VAR)
- if (${MODULE_NAME}_FOUND)
+ string(FIND " ${CMake_TEST_CMakeOnly.AllFindModules_NO_VERSION} " " ${MODULE_NAME} " _exclude_pos)
+ if (NOT _exclude_pos EQUAL -1)
+ message(STATUS "excluding check of ${VERSION_VAR}='${${VERSION_VAR}}' due to local configuration")
+ elseif (${MODULE_NAME}_FOUND)
if (DEFINED ${VERSION_VAR})
message(STATUS "${VERSION_VAR}='${${VERSION_VAR}}'")
if (NOT ${VERSION_VAR} MATCHES "^[0-9]")
diff --git a/Tests/CMakeOnly/CMakeLists.txt b/Tests/CMakeOnly/CMakeLists.txt
index d44c836..2b25766 100644
--- a/Tests/CMakeOnly/CMakeLists.txt
+++ b/Tests/CMakeOnly/CMakeLists.txt
@@ -37,7 +37,11 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio ([^789]|[789][0-9])")
add_CMakeOnly_test(CompilerIdCSharp)
endif()
-add_CMakeOnly_test(AllFindModules)
+add_test(CMakeOnly.AllFindModules ${CMAKE_CMAKE_COMMAND}
+ -DTEST=AllFindModules
+ -DCMAKE_ARGS=-DCMake_TEST_CMakeOnly.AllFindModules_NO_VERSION=${CMake_TEST_CMakeOnly.AllFindModules_NO_VERSION}
+ -P ${CMAKE_CURRENT_BINARY_DIR}/Test.cmake
+ )
add_CMakeOnly_test(SelectLibraryConfigurations)
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 5 ++++-
Tests/CMakeOnly/CMakeLists.txt | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake