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 0579f0660dab2bf8743e0ee8ee29b63d5cd5631d (commit)
via e03ff536ded3fd36bbbe5367129309ff5602dde0 (commit)
from 95d2dd810fc97b17a8516f5f6488aae3ee0c3c13 (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=0579f0660dab2bf8743e0ee8ee29b63d5cd5631d
commit 0579f0660dab2bf8743e0ee8ee29b63d5cd5631d
Merge: 95d2dd8 e03ff53
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Feb 18 16:32:37 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Feb 18 16:32:37 2013 -0500
Merge topic 'try_compile-targets' into next
e03ff53 Only find BZip2 if we're not using cmbzip2.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e03ff536ded3fd36bbbe5367129309ff5602dde0
commit e03ff536ded3fd36bbbe5367129309ff5602dde0
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Mon Feb 18 22:24:30 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Mon Feb 18 22:29:12 2013 +0100
Only find BZip2 if we're not using cmbzip2.
FindBZIP2 uses a try_compile, passing the bzip2 libraries to it. If
cmbzip2 is used, that is a in-build non-IMPORTED library, which is a
fatal error as of this topic. I'm not sure how that could ever work
as the library would not be built at cmake-time when FindBZIP2 is
executed.
diff --git a/Utilities/cmlibarchive/CMakeLists.txt
b/Utilities/cmlibarchive/CMakeLists.txt
index ebf28ae..c125339 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -186,7 +186,9 @@ ENDIF(ZLIB_FOUND)
#
# Find BZip2
#
-FIND_PACKAGE(BZip2)
+IF("${BZIP2_LIBRARIES}" STREQUAL "")
+ FIND_PACKAGE(BZip2)
+ENDIF()
IF(BZIP2_FOUND)
SET(HAVE_LIBBZ2 1)
SET(HAVE_BZLIB_H 1)
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmlibarchive/CMakeLists.txt | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
