[Cmake-commits] CMake branch, master, updated. v3.12.0-383-g8f0b3d2

[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  8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c (commit)
       via  00a5836a3de046aa910aee7ec3e015b155790422 (commit)
      from  90df5f673029ae5a9ca1e88fec9ed3aa67ad36d1 (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=8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c
commit 8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c
Merge: 90df5f6 00a5836
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 7 12:25:14 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Aug 7 08:25:21 2018 -0400

    Merge topic 'xerces-version-fix'
    
    00a5836a3d FindXercesC: Correct order of version detection and versioned library checks
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !2259


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00a5836a3de046aa910aee7ec3e015b155790422
commit 00a5836a3de046aa910aee7ec3e015b155790422
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Fri Aug 3 07:54:35 2018 +0100
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Fri Aug 3 07:54:35 2018 +0100

    FindXercesC: Correct order of version detection and versioned library checks

diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake
index 267c164..55db7ae 100644
--- a/Modules/FindXercesC.cmake
+++ b/Modules/FindXercesC.cmake
@@ -73,6 +73,10 @@ find_path(XercesC_INCLUDE_DIR
           DOC "Xerces-C++ include directory")
 mark_as_advanced(XercesC_INCLUDE_DIR)
 
+if(XercesC_INCLUDE_DIR)
+  _XercesC_GET_VERSION("${XercesC_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
+endif()
+
 if(NOT XercesC_LIBRARY)
   # Find all XercesC libraries
   find_library(XercesC_LIBRARY_RELEASE
@@ -90,10 +94,6 @@ 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()
-
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(XercesC
                                   FOUND_VAR XercesC_FOUND

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

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


hooks/post-receive
-- 
CMake