[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2188-gc4f5db7
Stephen Kelly
steveire at gmail.com
Tue Feb 19 04:53:00 EST 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 c4f5db7c079fc6e899e15d5e4ec8e5f351da0801 (commit)
via 174be33091457332dd2fc42c905d0de029f54257 (commit)
from 0579f0660dab2bf8743e0ee8ee29b63d5cd5631d (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=c4f5db7c079fc6e899e15d5e4ec8e5f351da0801
commit c4f5db7c079fc6e899e15d5e4ec8e5f351da0801
Merge: 0579f06 174be33
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 19 04:52:57 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 19 04:52:57 2013 -0500
Merge topic 'try_compile-targets' into next
174be33 Create a clean environment to invoke find_package(BZip2)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=174be33091457332dd2fc42c905d0de029f54257
commit 174be33091457332dd2fc42c905d0de029f54257
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 19 10:46:58 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 19 10:46:58 2013 +0100
Create a clean environment to invoke find_package(BZip2)
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index c125339..7427933 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -186,8 +186,11 @@ ENDIF(ZLIB_FOUND)
#
# Find BZip2
#
-IF("${BZIP2_LIBRARIES}" STREQUAL "")
- FIND_PACKAGE(BZip2)
+SET(BZIP2_LIBRARIES_BACKUP "${BZIP2_LIBRARIES}")
+UNSET(BZIP2_LIBRARIES)
+FIND_PACKAGE(BZip2)
+IF(NOT "${BZIP2_LIBRARIES_BACKUP}" STREQUAL "")
+ SET(BZIP2_LIBRARIES "${BZIP2_LIBRARIES_BACKUP}")
ENDIF()
IF(BZIP2_FOUND)
SET(HAVE_LIBBZ2 1)
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmlibarchive/CMakeLists.txt | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list