[Cmake-commits] CMake branch, next, updated. v3.4.2-2032-gda0dd89

[Roger Leigh]

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  da0dd89221bbf9a46dd6065c18023b9f62f682a2 (commit)
       via  3b61ef9dd48eaaacc2fa5123974d9cb9f68ae96d (commit)
      from  f0f0470cbf18cdea04873fd1ad67a6504f88a779 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da0dd89221bbf9a46dd6065c18023b9f62f682a2
commit da0dd89221bbf9a46dd6065c18023b9f62f682a2
Merge: f0f0470 3b61ef9
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jan 19 19:04:10 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 19 19:04:10 2016 -0500

    Merge topic 'xalanc' into next
    
    3b61ef9d FindXercesC: Pass REQUIRED flag to find_package conditionally


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b61ef9dd48eaaacc2fa5123974d9cb9f68ae96d
commit 3b61ef9dd48eaaacc2fa5123974d9cb9f68ae96d
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jan 19 23:57:55 2016 +0000
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Wed Jan 20 00:00:44 2016 +0000

    FindXercesC: Pass REQUIRED flag to find_package conditionally

diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index bdb823a..016b7aa 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -110,7 +110,12 @@ unset(XalanC_VERSION_MAJOR)
 unset(XalanC_VERSION_MINOR)
 unset(XalanC_VERSION_PATCH)
 
-find_package(XercesC) # TODO: require if we are required
+unset(XalanC_XERCESC_REQUIRED)
+if(XalanC_FIND_REQUIRED)
+  set(XalanC_XERCESC_REQUIRED REQUIRED)
+endif()
+find_package(XercesC ${XalanC_XERCESC_REQUIRED})
+unset(XalanC_XERCESC_REQUIRED)
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(XalanC

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindXalanC.cmake |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake