diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-07 12:25:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-07 12:25:21 (GMT) |
| commit | 8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c (patch) | |
| tree | 4f6feffa6eea02aeac2a6ffccc7f05f64d6faed8 | |
| parent | 90df5f673029ae5a9ca1e88fec9ed3aa67ad36d1 (diff) | |
| parent | 00a5836a3de046aa910aee7ec3e015b155790422 (diff) | |
| download | CMake-8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c.zip CMake-8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c.tar.gz CMake-8f0b3d2da61ef5d0322f3886e1ed0629f1673a9c.tar.bz2 | |
Merge topic 'xerces-version-fix'
00a5836a3d FindXercesC: Correct order of version detection and versioned library checks
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2259
| -rw-r--r-- | Modules/FindXercesC.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
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 |