[Cmake-commits] CMake branch, next, updated. v2.8.4-1368-g9c56172
Brad King
brad.king at kitware.com
Thu Apr 7 12:40:37 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 9c56172a70a27e2864f58b763ac328b9ce07a9af (commit)
via 0dafc0a8ed7a8951d9d17218255cca66ce787a9c (commit)
from 1df325da44520a4db2ddc6d2586b83d33d7ec807 (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=9c56172a70a27e2864f58b763ac328b9ce07a9af
commit 9c56172a70a27e2864f58b763ac328b9ce07a9af
Merge: 1df325d 0dafc0a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 7 12:40:32 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 7 12:40:32 2011 -0400
Merge topic 'FindZLIB-improve-found-message' into next
0dafc0a FindZLIB: print library instead of include directory
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dafc0a8ed7a8951d9d17218255cca66ce787a9c
commit 0dafc0a8ed7a8951d9d17218255cca66ce787a9c
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Apr 7 18:22:24 2011 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 7 12:38:43 2011 -0400
FindZLIB: print library instead of include directory
Before:
-- Found ZLIB: /usr/include (found version "1.2.3")
After:
-- Found ZLIB: /usr/lib/libz.so (found version "1.2.3")
diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index 2062a7e..77f9fda 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -67,7 +67,7 @@ ENDIF()
# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_INCLUDE_DIR ZLIB_LIBRARY
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
VERSION_VAR ZLIB_VERSION_STRING)
IF(ZLIB_FOUND)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindZLIB.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list