[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1218-ga48654d

[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  a48654dd5a588c9dfa196f1282c41fa6d4d99653 (commit)
       via  cf3e87e195448af50a9b2f0ca02732756e82ff2f (commit)
       via  8b8691adcad725e365407118d6d282994efad152 (commit)
      from  af28ca0a40bd9df7ba17b3f7de2d279dbbe184cd (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=a48654dd5a588c9dfa196f1282c41fa6d4d99653
commit a48654dd5a588c9dfa196f1282c41fa6d4d99653
Merge: af28ca0 cf3e87e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 19 13:38:31 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 19 13:38:31 2014 -0400

    Merge topic 'fix-AllFindModules-test-module-path' into next
    
    cf3e87e1 Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4
    8b8691ad CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf3e87e195448af50a9b2f0ca02732756e82ff2f
commit cf3e87e195448af50a9b2f0ca02732756e82ff2f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 19 13:33:00 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 19 13:33:00 2014 -0400

    Tests: Teach CMakeOnly.AllFindModules to tolerate a system KDE4
    
    The FindKDE4 module (incorrectly) modifies CMAKE_MODULE_PATH on the
    caller's behalf.  This causes KDE4-installed find modules to be used by
    the test instead of those in CMake.  Teach the test to restore the
    CMAKE_MODULE_PATH to its original value after each find_package call.
    This ensures that the next find_package actually tests our module.

diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 691728a..15493be 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -8,11 +8,14 @@ endif ()
 # Avoid ctest truncation of output
 message(STATUS "CTEST_FULL_OUTPUT")
 
+set(ORIGINAL_MODULE_PATH "${CMAKE_MODULE_PATH}")
+
 file(GLOB FIND_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/../../../Modules/Find*.cmake" )
 
 macro(do_find MODULE_NAME)
     message(STATUS "   Checking Find${MODULE_NAME}")
     find_package(${MODULE_NAME})
+    set(CMAKE_MODULE_PATH "${ORIGINAL_MODULE_PATH}")
 endmacro()
 
 # It is only possible to use either Qt3 or Qt4 in one project.

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

Summary of changes:
 Source/CMakeVersion.cmake                     |    2 +-
 Tests/CMakeOnly/AllFindModules/CMakeLists.txt |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake