mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-11 00:11:07 -06:00
FindXercesC: Correct order of version detection and versioned library checks
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user