[Cmake-commits] CMake branch, master, updated. v3.12.0-rc3-225-g4b00e57

[Kitware Robot]

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, master has been updated
       via  4b00e57de8aaed500de945411912b828892e84d3 (commit)
       via  82f39c9ce9e9ce9827b4a27abf3f6a1af427a5d2 (commit)
      from  992e9d10f818ead64f08b435432a6c5b5a0f6916 (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=4b00e57de8aaed500de945411912b828892e84d3
commit 4b00e57de8aaed500de945411912b828892e84d3
Merge: 992e9d1 82f39c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 16 12:21:49 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 16 08:21:55 2018 -0400

    Merge topic 'FindXercesC-versioned-names'
    
    82f39c9ce9 FindXercesC: Search for version-named library files
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Acked-by: Roger Leigh <rleigh at codelibre.net>
    Merge-request: !2210


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82f39c9ce9e9ce9827b4a27abf3f6a1af427a5d2
commit 82f39c9ce9e9ce9827b4a27abf3f6a1af427a5d2
Author:     Raul Metsma <raul at metsma.ee>
AuthorDate: Wed Jul 11 16:43:34 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 13 09:01:47 2018 -0400

    FindXercesC: Search for version-named library files
    
    Use the version number extracted from the header file to construct
    versioned library names.  This approach is already used by `FindXalanC`.
    
    Signed-off-by: Raul Metsma <raul at metsma.ee>

diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake
index 51e68d5..267c164 100644
--- a/Modules/FindXercesC.cmake
+++ b/Modules/FindXercesC.cmake
@@ -59,6 +59,9 @@ function(_XercesC_GET_VERSION  version_hdr)
         endif()
 
         set(XercesC_VERSION "${XercesC_MAJOR}.${XercesC_MINOR}.${XercesC_PATCH}" PARENT_SCOPE)
+        set(XercesC_VERSION_MAJOR "${XercesC_MAJOR}" PARENT_SCOPE)
+        set(XercesC_VERSION_MINOR "${XercesC_MINOR}" PARENT_SCOPE)
+        set(XercesC_VERSION_PATCH "${XercesC_PATCH}" PARENT_SCOPE)
     else()
         message(FATAL_ERROR "Include file ${version_hdr} does not exist or does not contain expected version information")
     endif()
@@ -73,16 +76,20 @@ mark_as_advanced(XercesC_INCLUDE_DIR)
 if(NOT XercesC_LIBRARY)
   # Find all XercesC libraries
   find_library(XercesC_LIBRARY_RELEASE
-               NAMES "xerces-c" "xerces-c_3"
+               NAMES "xerces-c" "xerces-c_${XercesC_VERSION_MAJOR}"
                DOC "Xerces-C++ libraries (release)")
   find_library(XercesC_LIBRARY_DEBUG
-               NAMES "xerces-cd" "xerces-c_3D" "xerces-c_3_1D"
+               NAMES "xerces-cd" "xerces-c_${XercesC_VERSION_MAJOR}D" "xerces-c_${XercesC_VERSION_MAJOR}_${XercesC_VERSION_MINOR}D"
                DOC "Xerces-C++ libraries (debug)")
   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
   select_library_configurations(XercesC)
   mark_as_advanced(XercesC_LIBRARY_RELEASE XercesC_LIBRARY_DEBUG)
 endif()
 
+unset(XercesC_VERSION_MAJOR)
+unset(XercesC_VERSION_MINOR)
+unset(XercesC_VERSION_PATCH)
+
 if(XercesC_INCLUDE_DIR)
   _XercesC_GET_VERSION("${XercesC_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
 endif()

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

Summary of changes:
 Modules/FindXercesC.cmake | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake