[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-467-g955104e

[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  955104e6637fad91e8f82d92b34a122aef263319 (commit)
       via  7e187eeacd609c18940aa7cd700b048f72fd5568 (commit)
      from  1b0b51424e47867239e71b3cf0646c1f744d6102 (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=955104e6637fad91e8f82d92b34a122aef263319
commit 955104e6637fad91e8f82d92b34a122aef263319
Merge: 1b0b514 7e187ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 4 09:39:36 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 4 09:39:36 2014 -0500

    Merge topic 'fix-CMP0017-check' into next
    
    7e187eea CMP0017: Fix check when including from CMake source tree


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e187eeacd609c18940aa7cd700b048f72fd5568
commit 7e187eeacd609c18940aa7cd700b048f72fd5568
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 4 09:28:48 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 4 09:35:00 2014 -0500

    CMP0017: Fix check when including from CMake source tree
    
    When running CMake from the build tree the CMAKE_ROOT is the
    entire source tree.  Fix the CMP0017 check to be specific to
    the Modules/ directory under CMAKE_ROOT so that Tests/ does
    not count.  Fix the FindPackageTest modules to include FPHSA
    by full path from CMAKE_ROOT so that they do not include the
    local FPHSA which reports an error meant to test that CMP0017
    works.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f248c57..556e7a4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3337,7 +3337,8 @@ std::string cmMakefile::GetModulesFile(const char* filename) const
   if ((moduleInCMakeModulePath.size()>0) && (moduleInCMakeRoot.size()>0))
     {
     const char* currentFile = this->GetDefinition("CMAKE_CURRENT_LIST_FILE");
-    if (currentFile && (strstr(currentFile, cmakeRoot) == currentFile))
+    std::string mods = cmakeRoot + std::string("/Modules/");
+    if (currentFile && strncmp(currentFile, mods.c_str(), mods.size()) == 0)
       {
       switch (this->GetPolicyStatus(cmPolicies::CMP0017))
         {
diff --git a/Tests/FindPackageTest/FindLotsOfComponents.cmake b/Tests/FindPackageTest/FindLotsOfComponents.cmake
index 9076d86..5d959c5 100644
--- a/Tests/FindPackageTest/FindLotsOfComponents.cmake
+++ b/Tests/FindPackageTest/FindLotsOfComponents.cmake
@@ -4,7 +4,7 @@ set(LotsOfComponents_AComp_FOUND TRUE)
 set(LotsOfComponents_BComp_FOUND FALSE)
 set(LotsOfComponents_CComp_FOUND TRUE)
 
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 
 find_package_handle_standard_args(LotsOfComponents REQUIRED_VARS LOC_FOO
                                                    HANDLE_COMPONENTS)
diff --git a/Tests/FindPackageTest/FindSomePackage.cmake b/Tests/FindPackageTest/FindSomePackage.cmake
index 83d1d0e..7283d24 100644
--- a/Tests/FindPackageTest/FindSomePackage.cmake
+++ b/Tests/FindPackageTest/FindSomePackage.cmake
@@ -1,6 +1,6 @@
 set(SOP_FOO TRUE)
 
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 
 find_package_handle_standard_args(SomePackage REQUIRED_VARS SOP_FOO
                                               FOUND_VAR SomePackage_FOUND )
diff --git a/Tests/FindPackageTest/FindUpperCasePackage.cmake b/Tests/FindPackageTest/FindUpperCasePackage.cmake
index 66c2fea..425d417 100644
--- a/Tests/FindPackageTest/FindUpperCasePackage.cmake
+++ b/Tests/FindPackageTest/FindUpperCasePackage.cmake
@@ -1,6 +1,6 @@
 set(UCP_FOO TRUE)
 
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 
 find_package_handle_standard_args(UpperCasePackage REQUIRED_VARS UCP_FOO
                                                    FOUND_VAR UPPERCASEPACKAGE_FOUND )

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

Summary of changes:
 Source/cmMakefile.cxx                            |    3 ++-
 Tests/FindPackageTest/FindLotsOfComponents.cmake |    2 +-
 Tests/FindPackageTest/FindSomePackage.cmake      |    2 +-
 Tests/FindPackageTest/FindUpperCasePackage.cmake |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake