Import Geant4 10.4.0.beta source tree

source/externals/expat/CMakeLists.txt

@@ -26,3 +26,19 @@ if(TARGET G4expat-static)
   target_compile_definitions(G4expat-static PUBLIC XML_STATIC)
 endif()
 
+# Externals are a special case during migration to new CMake system.
+# To ensure compatibility with both old and new systems, need
+# to set INCLUDE_DIRECTORIES usage requirement. Does not affect
+# build-time inc dirs, simply propagates public includes to
+# clients who link to G4expat target inside Geant4
+foreach(__g4expat_target G4expat G4expat-static)
+  if(TARGET ${__g4expat_target})
+    target_include_directories(${__g4expat_target}
+      PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+      PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+      )
+  endif()
+endforeach()
+

source/externals/expat/History

@@ -14,6 +14,13 @@ committal in the CVS repository !
      ----------------------------------------------------------
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+03-February-2017: Ben Morgan expat-V10-03-00
+- Set interface include directories on G4expat{-static} targets
+  in CMakeLists.txt. This provides the needed interface to allow transparent
+  usage of internal/external expat via targets and without needing to use
+  include_directories explicitly. Only set include paths in BUILD
+  interface for consistency with other targets.
+
 24-September-2015: Ben Morgan  expat-V10-01-01
 - CMakeLists.txt : Add XML_STATIC to public compile definitions 
   of G4expat-static. Required on Windows platforms to ensure correct