ENH: itkexpat: Update includes to reliably use ITK's expat headers

Author: bradking

Modules/IO/XML/src/itkDOMNodeXMLReader.cxx

@@ -17,7 +17,7 @@
  *=========================================================================*/
 
 #include "itkDOMNodeXMLReader.h"
-#include "expat.h"
+#include "itk_expat.h"
 
 #include <fstream>
 

Modules/IO/XML/src/itkXMLFile.cxx

@@ -19,7 +19,7 @@
 #include "itksys/SystemTools.hxx"
 #include "itkMakeUniqueForOverwrite.h"
 #include <fstream>
-#include "expat.h"
+#include "itk_expat.h"
 
 namespace itk
 {

Modules/ThirdParty/Expat/CMakeLists.txt

@@ -12,13 +12,16 @@ if(ITK_USE_SYSTEM_EXPAT)
   set(ITKExpat_NO_SRC 1)
 else()
   set(ITKExpat_INCLUDE_DIRS
-  ${ITKExpat_BINARY_DIR}/src/itkexpat
-  ${ITKExpat_SOURCE_DIR}/src/itkexpat/lib
+    ${ITKExpat_BINARY_DIR}/src
+    ${ITKExpat_BINARY_DIR}/src/itkexpat
+    ${ITKExpat_SOURCE_DIR}/src
   )
 set(ITKExpat_LIBRARIES ITKEXPAT)
 set(ITK_LIBRARY_PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS FALSE)
 set(EXPAT_GE ON CACHE BOOL   "Define to make general entity parsing functionality available" FORCE)
 set(XML_GE 1    CACHE STRING "Define to make general entity parsing functionality available" FORCE)
 endif()
 
+configure_file(src/itk_expat.h.in src/itk_expat.h)
+
 itk_module_impl()

Modules/ThirdParty/Expat/src/itk_expat.h.in

@@ -0,0 +1,30 @@
+/*=========================================================================
+ *
+ *  Copyright NumFOCUS
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *=========================================================================*/
+
+#ifndef itk_expat_h
+#define itk_expat_h
+
+/* Use the expat library configured for ITK.  */
+#cmakedefine ITK_USE_SYSTEM_EXPAT
+#ifdef ITK_USE_SYSTEM_EXPAT
+# include <expat.h>
+#else
+# include "itkexpat/lib/expat.h"
+#endif
+
+#endif

Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcm_expat.h

@@ -17,7 +17,7 @@
 /* Use the expat library configured for gdcm.  */
 #include "gdcmTypes.h"
 #ifdef GDCM_USE_SYSTEM_EXPAT
-# include "expat.h"
+# include "itk_expat.h"
 #else
 # include "gdcmexpat/lib/expat.h"
 #endif

Modules/ThirdParty/GIFTI/src/gifticlib/gifti_io.h

@@ -2,7 +2,7 @@
 #define GIFTI_IO_H
 
 #include <itk_zlib.h>
-#include <expat.h>
+#include <itk_expat.h>
 #include <nifti1_io.h>
 
 #ifdef  __cplusplus