[Cmake-commits] CMake branch, next, updated. v3.4.1-2021-g4af8e76

[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  4af8e762a976e3602c477d05275db3f7156e7a5f (commit)
       via  a11c0e7716d57fa7042632868d808b35d9372bb2 (commit)
      from  f1bbd9719009f15afdbcf2a62c10c7779d5c1ace (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=4af8e762a976e3602c477d05275db3f7156e7a5f
commit 4af8e762a976e3602c477d05275db3f7156e7a5f
Merge: f1bbd97 a11c0e7
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jan 19 11:38:01 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 19 11:38:01 2016 -0500

    Merge topic 'xalanc' into next
    
    a11c0e77 FindXalanC: Correct versioning for Windows DLLs


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

    FindXalanC: Correct versioning for Windows DLLs

diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index 7599bd4..58a68d8 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -71,6 +71,9 @@ function(_XalanC_GET_VERSION  version_hdr)
         endif()
 
         set(XalanC_VERSION "${XalanC_MAJOR}.${XalanC_MINOR}.${XalanC_PATCH}" PARENT_SCOPE)
+        set(XalanC_VERSION_MAJOR "${XalanC_MAJOR}" PARENT_SCOPE)
+        set(XalanC_VERSION_MINOR "${XalanC_MINOR}" PARENT_SCOPE)
+        set(XalanC_VERSION_PATCH "${XalanC_PATCH}" PARENT_SCOPE)
     else()
         message(FATAL_ERROR "Include file ${version_hdr} does not exist or does not contain expected version information")
     endif()
@@ -90,19 +93,23 @@ if(NOT XalanC_LIBRARY)
   # Find all XalanC libraries
   find_library(XalanC_LIBRARY_RELEASE
                NAMES "Xalan-C" "xalan-c"
-                     "Xalan-C_${XalanC_MAJOR}"
-                     "Xalan-C_${XalanC_MAJOR}_${XalanC_MINOR}"
+                     "Xalan-C_${XalanC_VERSION_MAJOR}"
+                     "Xalan-C_${XalanC_VERSION_MAJOR}_${XalanC_VERSION_MINOR}"
                DOC "Xalan-C++ libraries (release)")
   find_library(XalanC_LIBRARY_DEBUG
                NAMES "Xalan-CD" "xalan-cd"
-                     "Xalan-C_${XalanC_MAJOR}D"
-                     "Xalan-C_${XalanC_MAJOR}_${XalanC_MINOR}D"
+                     "Xalan-C_${XalanC_VERSION_MAJOR}D"
+                     "Xalan-C_${XalanC_VERSION_MAJOR}_${XalanC_VERSION_MINOR}D"
                DOC "Xalan-C++ libraries (debug)")
   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
   select_library_configurations(XalanC)
   mark_as_advanced(XalanC_LIBRARY_RELEASE XalanC_LIBRARY_DEBUG)
 endif()
 
+unset(XalanC_VERSION_MAJOR)
+unset(XalanC_VERSION_MINOR)
+unset(XalanC_VERSION_PATCH)
+
 find_package(XercesC 3.0.0 REQUIRED)
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)

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

Summary of changes:
 Modules/FindXalanC.cmake |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake