summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-31 16:14:42 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-01-31 16:16:04 (GMT)
commita2dc420cd4946eb3b17fcdcc6c32dafc7c679ad5 (patch)
tree2b3f686454a1bfae33ca7d2703684d10dc1e09ac
parent0933707d5c8b18401834e0787157e2de68f98e51 (diff)
parentc68465f7908336a29c48539cb9ac0dcb32310abb (diff)
downloadCMake-a2dc420cd4946eb3b17fcdcc6c32dafc7c679ad5.zip
CMake-a2dc420cd4946eb3b17fcdcc6c32dafc7c679ad5.tar.gz
CMake-a2dc420cd4946eb3b17fcdcc6c32dafc7c679ad5.tar.bz2
Merge topic 'xerces-xalan-header-checking'
c68465f790 FindXercesC, FindXalanC: Don't examine non-existent version headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2884
-rw-r--r--Modules/FindXalanC.cmake2
-rw-r--r--Modules/FindXercesC.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindXalanC.cmake b/Modules/FindXalanC.cmake
index 0eba3d9..3adaa44 100644
--- a/Modules/FindXalanC.cmake
+++ b/Modules/FindXalanC.cmake
@@ -76,7 +76,7 @@ find_path(XalanC_INCLUDE_DIR
DOC "Xalan-C++ include directory")
mark_as_advanced(XalanC_INCLUDE_DIR)
-if(XalanC_INCLUDE_DIR)
+if(XalanC_INCLUDE_DIR AND EXISTS "${XalanC_INCLUDE_DIR}/xalanc/Include/XalanVersion.hpp")
_XalanC_GET_VERSION("${XalanC_INCLUDE_DIR}/xalanc/Include/XalanVersion.hpp")
endif()
diff --git a/Modules/FindXercesC.cmake b/Modules/FindXercesC.cmake
index 085fafc..47bfd62 100644
--- a/Modules/FindXercesC.cmake
+++ b/Modules/FindXercesC.cmake
@@ -74,7 +74,7 @@ find_path(XercesC_INCLUDE_DIR
DOC "Xerces-C++ include directory")
mark_as_advanced(XercesC_INCLUDE_DIR)
-if(XercesC_INCLUDE_DIR)
+if(XercesC_INCLUDE_DIR AND EXISTS "${XercesC_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
_XercesC_GET_VERSION("${XercesC_INCLUDE_DIR}/xercesc/util/XercesVersion.hpp")
endif()