[Cmake-commits] CMake branch, next, updated. v3.4.1-2025-g9641548

[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  9641548007af875da7a25525037cae7447ae07dd (commit)
       via  a7940807d7ab684f201271441afa29095378b1c9 (commit)
       via  ca1e830693328c4162294b215bfd3d18c7860702 (commit)
       via  639104a6fedd90748151655d3cbfe36c2d1fa6f5 (commit)
      from  4af8e762a976e3602c477d05275db3f7156e7a5f (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=9641548007af875da7a25525037cae7447ae07dd
commit 9641548007af875da7a25525037cae7447ae07dd
Merge: 4af8e76 a794080
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jan 19 12:01:03 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 19 12:01:03 2016 -0500

    Merge topic 'xalanc' into next
    
    a7940807 Help: Document new FindXalanC module
    ca1e8306 FindXercesC: Don't require a specific Xerces-C version
    639104a6 FindXercesC: XalanC_INCLUDE_DIRS and XalanC_LIBRARIES include dependencies


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7940807d7ab684f201271441afa29095378b1c9
commit a7940807d7ab684f201271441afa29095378b1c9
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jan 19 17:00:18 2016 +0000
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Tue Jan 19 17:00:18 2016 +0000

    Help: Document new FindXalanC module

diff --git a/Help/release/dev/FindXalanC.rst b/Help/release/dev/FindXalanC.rst
new file mode 100644
index 0000000..1617253
--- /dev/null
+++ b/Help/release/dev/FindXalanC.rst
@@ -0,0 +1,5 @@
+FindXalanC
+----------
+
+* A new module to find the Apache Xalan-C++ XSL transform processing
+  library.

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca1e830693328c4162294b215bfd3d18c7860702
commit ca1e830693328c4162294b215bfd3d18c7860702
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jan 19 16:59:35 2016 +0000
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Tue Jan 19 16:59:35 2016 +0000

    FindXercesC: Don't require a specific Xerces-C version

diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index 6a9f114..99b31d1 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -110,7 +110,7 @@ unset(XalanC_VERSION_MAJOR)
 unset(XalanC_VERSION_MINOR)
 unset(XalanC_VERSION_PATCH)
 
-find_package(XercesC 3.0.0 REQUIRED)
+find_package(XercesC REQUIRED)
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(XalanC

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=639104a6fedd90748151655d3cbfe36c2d1fa6f5
commit 639104a6fedd90748151655d3cbfe36c2d1fa6f5
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jan 19 16:59:14 2016 +0000
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Tue Jan 19 16:59:14 2016 +0000

    FindXercesC: XalanC_INCLUDE_DIRS and XalanC_LIBRARIES include dependencies

diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index 58a68d8..6a9f114 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -123,8 +123,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(XalanC
                                   FAIL_MESSAGE "Failed to find XalanC")
 
 if(XalanC_FOUND)
-  set(XalanC_INCLUDE_DIRS "${XalanC_INCLUDE_DIR}")
-  set(XalanC_LIBRARIES "${XalanC_LIBRARY}")
+  set(XalanC_INCLUDE_DIRS "${XalanC_INCLUDE_DIR}" ${XercesC_INCLUDE_DIRS})
+  set(XalanC_LIBRARIES "${XalanC_LIBRARY}" ${XercesC_LIBRARIES})
 
   # For header-only libraries
   if(NOT TARGET XalanC::XalanC)
diff --git a/Tests/FindXalanC/Test/CMakeLists.txt b/Tests/FindXalanC/Test/CMakeLists.txt
index 56f6f48..b445e0e 100644
--- a/Tests/FindXalanC/Test/CMakeLists.txt
+++ b/Tests/FindXalanC/Test/CMakeLists.txt
@@ -12,6 +12,6 @@ target_link_libraries(test_xalanc_tgt XalanC::XalanC)
 add_test(NAME test_xalanc_tgt COMMAND test_xalanc_tgt)
 
 add_executable(test_xalanc_var main.cxx)
-target_include_directories(test_xalanc_var PRIVATE ${XalanC_INCLUDE_DIRS} ${XercesC_INCLUDE_DIRS})
-target_link_libraries(test_xalanc_var PRIVATE ${XalanC_LIBRARIES} ${XercesC_LIBRARIES})
+target_include_directories(test_xalanc_var PRIVATE ${XalanC_INCLUDE_DIRS})
+target_link_libraries(test_xalanc_var PRIVATE ${XalanC_LIBRARIES})
 add_test(NAME test_xalanc_var COMMAND test_xalanc_var)

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

Summary of changes:
 Help/release/dev/FindXalanC.rst      |    5 +++++
 Modules/FindXalanC.cmake             |    6 +++---
 Tests/FindXalanC/Test/CMakeLists.txt |    4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 Help/release/dev/FindXalanC.rst


hooks/post-receive
-- 
CMake