[Cmake-commits] CMake branch, next, updated. v3.0.2-5563-g18e64f0

[Rolf Eike Beer]

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  18e64f0122b0c6e878b4284f185bfda7b81ec790 (commit)
       via  3670c6a41c9a8f09afd6230b99389d186c348c3e (commit)
      from  cd312091fba12663d90f7dc612837ce72882e205 (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=18e64f0122b0c6e878b4284f185bfda7b81ec790
commit 18e64f0122b0c6e878b4284f185bfda7b81ec790
Merge: cd31209 3670c6a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Oct 2 17:45:27 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 2 17:45:27 2014 -0400

    Merge topic 'FPHSA-include' into next
    
    3670c6a4 fix inclusion of FPHSA


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3670c6a41c9a8f09afd6230b99389d186c348c3e
commit 3670c6a41c9a8f09afd6230b99389d186c348c3e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Oct 2 23:44:39 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Oct 2 23:44:39 2014 +0200

    fix inclusion of FPHSA
    
    Make sure these modules also include exactly the version shipped with CMake.

diff --git a/Modules/FindBacktrace.cmake b/Modules/FindBacktrace.cmake
index 5620661..07109b0 100644
--- a/Modules/FindBacktrace.cmake
+++ b/Modules/FindBacktrace.cmake
@@ -44,7 +44,7 @@
 
 include(CMakePushCheckState)
 include(CheckSymbolExists)
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 
 # List of variables to be provided to find_package_handle_standard_args()
 set(_Backtrace_STD_ARGS Backtrace_INCLUDE_DIR)
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake
index 60a4107..55528b8 100644
--- a/Modules/FindIce.cmake
+++ b/Modules/FindIce.cmake
@@ -334,7 +334,7 @@ endfunction()
 
 _Ice_FIND()
 
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ice
                                   FOUND_VAR Ice_FOUND
                                   REQUIRED_VARS Ice_SLICE2CPP_EXECUTABLE
diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index 4076521..2b7fd22 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -201,7 +201,7 @@ else()
 endif()
 
 # record if Squish was found
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 find_package_handle_standard_args(Squish  REQUIRED_VARS  SQUISH_INSTALL_DIR SQUISH_CLIENT_EXECUTABLE SQUISH_SERVER_EXECUTABLE
                                           VERSION_VAR  SQUISH_VERSION )
 
diff --git a/Modules/FindXerces.cmake b/Modules/FindXerces.cmake
index 325bb6d..6c6007a 100644
--- a/Modules/FindXerces.cmake
+++ b/Modules/FindXerces.cmake
@@ -70,7 +70,7 @@ if(Xerces_INCLUDE_DIR)
   _Xerces_GET_VERSION("${Xerces_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
 endif()
 
-include(FindPackageHandleStandardArgs)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xerces
                                   FOUND_VAR Xerces_FOUND
                                   REQUIRED_VARS Xerces_LIBRARY

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

Summary of changes:
 Modules/FindBacktrace.cmake |    2 +-
 Modules/FindIce.cmake       |    2 +-
 Modules/FindSquish.cmake    |    2 +-
 Modules/FindXerces.cmake    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake