[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3488-g233ab81

Brad King brad.king at kitware.com
Mon Jul 29 10:39:37 EDT 2013


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  233ab81445caf7658b55a5594726b78872319342 (commit)
       via  5f65a5ecac02078a3ecd93ed18bf4c1c47cd5332 (commit)
      from  a3abaa55d92d9d941d17d9cdda58718f76087591 (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=233ab81445caf7658b55a5594726b78872319342
commit 233ab81445caf7658b55a5594726b78872319342
Merge: a3abaa5 5f65a5e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 29 10:39:36 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 29 10:39:36 2013 -0400

    Merge topic 'update-libarchive' into next
    
    5f65a5e libarchive: Avoid requiring CMake 2.8.8 for CMakeExpandImportedTargets


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f65a5ecac02078a3ecd93ed18bf4c1c47cd5332
commit 5f65a5ecac02078a3ecd93ed18bf4c1c47cd5332
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 26 16:59:48 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 29 10:38:26 2013 -0400

    libarchive: Avoid requiring CMake 2.8.8 for CMakeExpandImportedTargets
    
    Include the module from our own source tree directly.

diff --git a/Utilities/cmlibarchive/build/cmake/LibarchiveCheckCSourceCompiles.cmake b/Utilities/cmlibarchive/build/cmake/LibarchiveCheckCSourceCompiles.cmake
index 6b6f593..a0eac64 100644
--- a/Utilities/cmlibarchive/build/cmake/LibarchiveCheckCSourceCompiles.cmake
+++ b/Utilities/cmlibarchive/build/cmake/LibarchiveCheckCSourceCompiles.cmake
@@ -29,7 +29,7 @@
 # CMAKE_REQUIRED_LINKER_FLAGS = string of linker command line flags
 #
 
-include(CMakeExpandImportedTargets)
+include(${CMake_SOURCE_DIR}/Modules/CMakeExpandImportedTargets.cmake)
 
 
 macro(LIBARCHIVE_CHECK_C_SOURCE_COMPILES SOURCE VAR)
diff --git a/Utilities/cmlibarchive/build/cmake/LibarchiveCheckCSourceRuns.cmake b/Utilities/cmlibarchive/build/cmake/LibarchiveCheckCSourceRuns.cmake
index 498f522..4d91e09 100644
--- a/Utilities/cmlibarchive/build/cmake/LibarchiveCheckCSourceRuns.cmake
+++ b/Utilities/cmlibarchive/build/cmake/LibarchiveCheckCSourceRuns.cmake
@@ -29,7 +29,7 @@
 # CMAKE_REQUIRED_LINKER_FLAGS = string of linker command line flags
 #
 
-include(CMakeExpandImportedTargets)
+include(${CMake_SOURCE_DIR}/Modules/CMakeExpandImportedTargets.cmake)
 
 
 macro(LIBARCHIVE_CHECK_C_SOURCE_RUNS SOURCE VAR)

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

Summary of changes:
 .../cmake/LibarchiveCheckCSourceCompiles.cmake     |    2 +-
 .../build/cmake/LibarchiveCheckCSourceRuns.cmake   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list