[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-213-g988fc13

[Brad King]

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  988fc13c0e286c6ea26c7ab0d485733b8e663bbe (commit)
       via  c05678ad2873bc0ee9070c9eab181242c3e115a0 (commit)
       via  29c266eb56e4e17894574f8a838a372f809d671e (commit)
      from  c688ba680d7b4a6c29093fa7c076c953a54904a9 (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=988fc13c0e286c6ea26c7ab0d485733b8e663bbe
commit 988fc13c0e286c6ea26c7ab0d485733b8e663bbe
Merge: c688ba6 c05678a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 19 09:21:47 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 19 09:21:47 2016 -0500

    Merge topic 'test-FindPackageModeMakefileTest-optionally' into next
    
    c05678ad Tests: Add option to disable FindPackageModeMakefileTest
    29c266eb CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c05678ad2873bc0ee9070c9eab181242c3e115a0
commit c05678ad2873bc0ee9070c9eab181242c3e115a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 19 09:10:44 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 19 09:10:44 2016 -0500

    Tests: Add option to disable FindPackageModeMakefileTest
    
    This test does not work in all environments, so add an option to
    disable it.

diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
index 8e21c32..56fcc5d 100644
--- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt
+++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 
-if(UNIX  AND  "${CMAKE_GENERATOR}" MATCHES "Makefile")
+if(UNIX  AND  "${CMAKE_GENERATOR}" MATCHES "Makefile" AND
+    NOT CMake_TEST_NO_FindPackageModeMakefileTest)
 
   # Test whether the make is GNU make, and only add the test in this case,
   # since the configured makefile in this test uses $(shell ...), which

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake                        |    2 +-
 Tests/FindPackageModeMakefileTest/CMakeLists.txt |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake