[Cmake-commits] CMake branch, next, updated. v2.8.7-2198-g30c4f7e
Rolf Eike Beer
eike at sf-mail.de
Mon Jan 23 14:06:49 EST 2012
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 30c4f7ebf72275894417ec55b5296b701014d6ce (commit)
via a5fd3915c9a0562f1e97aa38692ade0200c8ba28 (commit)
from c63a1a9c5756b3a80ee1d94c0108165151dd2d67 (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=30c4f7ebf72275894417ec55b5296b701014d6ce
commit 30c4f7ebf72275894417ec55b5296b701014d6ce
Merge: c63a1a9 a5fd391
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 23 14:06:43 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 23 14:06:43 2012 -0500
Merge topic 'improve-libxml2' into next
a5fd391 FindLibXml2: support version selection
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5fd3915c9a0562f1e97aa38692ade0200c8ba28
commit a5fd3915c9a0562f1e97aa38692ade0200c8ba28
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 23 19:26:16 2012 +0100
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 23 20:06:03 2012 +0100
FindLibXml2: support version selection
diff --git a/Modules/FindLibXml2.cmake b/Modules/FindLibXml2.cmake
index 95ae180..dbc50cf 100644
--- a/Modules/FindLibXml2.cmake
+++ b/Modules/FindLibXml2.cmake
@@ -6,6 +6,7 @@
# LIBXML2_LIBRARIES - The libraries needed to use LibXml2
# LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
# LIBXML2_XMLLINT_EXECUTABLE - The XML checking tool xmllint coming with LibXml2
+# LIBXML2_VERSION_STRING - the version of LibXml2 found (since CMake 2.8.8)
#=============================================================================
# Copyright 2006-2009 Kitware, Inc.
@@ -47,7 +48,12 @@ SET(XMLLINT_EXECUTABLE "${LIBXML2_XMLLINT_EXECUTABLE}")
# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2
+ REQUIRED_VARS LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR
+ VERSION_VAR PC_LIBXML_VERSION)
-MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES LIBXML2_XMLLINT_EXECUTABLE)
+IF(LIBXML2_FOUND)
+ SET(LIBXML2_VERSION_STRING ${PC_LIBXML_VERSION})
+ENDIF()
+MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES LIBXML2_XMLLINT_EXECUTABLE)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindLibXml2.cmake | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list