瀏覽代碼

Merge topic 'xerces-xalan-header-checking'

c68465f790 FindXercesC, FindXalanC: Don't examine non-existent version headers

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2884
Brad King 6 年之前
父節點
當前提交
a2dc420cd4
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      Modules/FindXalanC.cmake
  2. 1 1
      Modules/FindXercesC.cmake

+ 1 - 1
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()
 

+ 1 - 1
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()