[Cmake-commits] CMake branch, next, updated. v2.8.4-1312-g3f6870e
Brad King
brad.king at kitware.com
Thu Mar 31 17:01:07 EDT 2011
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 3f6870e481d7f304f2c654e6c0dc612a406bcf5e (commit)
via 9c78ef13951de5a4b648823bb574e9436e6b7504 (commit)
from fab9c6a304beea03addac13ec88a38dcf6e711fd (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=3f6870e481d7f304f2c654e6c0dc612a406bcf5e
commit 3f6870e481d7f304f2c654e6c0dc612a406bcf5e
Merge: fab9c6a 9c78ef1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 31 17:01:06 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 31 17:01:06 2011 -0400
Merge topic 'nonstandard-system-libarchive' into next
9c78ef1 COMP: Fix build against non-standard outside libarchive
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c78ef13951de5a4b648823bb574e9436e6b7504
commit 9c78ef13951de5a4b648823bb574e9436e6b7504
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 31 16:59:03 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 31 16:59:03 2011 -0400
COMP: Fix build against non-standard outside libarchive
Use the include directories reported by find_package(LibArchive).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c40bc26..93822ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -325,6 +325,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
IF(NOT LibArchive_FOUND)
MESSAGE(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is not found!")
ENDIF()
+ SET(CMAKE_TAR_INCLUDES ${LibArchive_INCLUDE_DIRS})
SET(CMAKE_TAR_LIBRARIES ${LibArchive_LIBRARIES})
ELSE(CMAKE_USE_SYSTEM_LIBARCHIVE)
SET(HAVE_LIBZ 1)
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list