echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FindXercesC: Correct order of version detection and versioned library checks

Browse Source
This commit is contained in:
Roger Leigh 2018-08-03 07:54:35 +01:00
parent ce309b624a
commit 00a5836a3d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindXercesC.cmake
View File

@ -73,6 +73,10 @@ find_path(XercesC_INCLUDE_DIR
DOC "Xerces-C++ include directory") DOC "Xerces-C++ include directory")
mark_as_advanced(XercesC_INCLUDE_DIR) 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) if(NOT XercesC_LIBRARY)
# Find all XercesC libraries # Find all XercesC libraries
find_library(XercesC_LIBRARY_RELEASE find_library(XercesC_LIBRARY_RELEASE
@ -90,10 +94,6 @@ unset(XercesC_VERSION_MAJOR)
unset(XercesC_VERSION_MINOR) unset(XercesC_VERSION_MINOR)
unset(XercesC_VERSION_PATCH) 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) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(XercesC FIND_PACKAGE_HANDLE_STANDARD_ARGS(XercesC
FOUND_VAR XercesC_FOUND FOUND_VAR XercesC_FOUND