Import Geant4 11.1.0.beta source tree

source/externals/expat/CMakeLists.txt

@@ -88,14 +88,12 @@ set(G4expat_SOURCES
   src/xmltok_impl.h
   src/xmltok_ns.cc)
 
-
 # - Create target(s) and set usage requirements
-geant4_library_target(NAME G4expat SOURCES ${G4expat_SOURCES} ${G4expat_HEADERS})
+geant4_add_external_library(NAME G4expat SOURCES ${G4expat_SOURCES} ${G4expat_HEADERS})
 foreach(__g4expat_target G4expat G4expat-static)
   if(TARGET ${__g4expat_target})
     target_include_directories(${__g4expat_target}
       PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
       PRIVATE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
@@ -107,11 +105,6 @@ if(TARGET G4expat-static)
   target_compile_definitions(G4expat-static PUBLIC XML_STATIC)
 endif()
 
-# - Ensure the header directory gets added to the list of ones to export
-set_property(GLOBAL APPEND PROPERTY GEANT4_BUILDTREE_INCLUDE_DIRS
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
 # Install headers alongside Geant4
 install(FILES ${G4expat_HEADERS}
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}

source/externals/expat/History

@@ -1,19 +1,17 @@
+# Category expat History
 
-     =========================================================
-     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
-     =========================================================
+See `CONTRIBUTING.rst` for details of **required** info/format for each entry,
+which **must** added in reverse chronological order (newest at the top). It must **not**
+be used as a substitute for writing good git commit messages!
 
-                      Category History file
-                      ---------------------
-This file should be used by G4 developers and category coordinators
-to briefly summarize all major modifications introduced in the code
-and keep track of all category-tags.
-It DOES NOT substitute the  CVS log-message one should put at every
-committal in the CVS repository !
 
-     ----------------------------------------------------------
-     * Reverse chronological order (last date on top), please *
-     ----------------------------------------------------------
+## 2021-12-10 Ben Morgan (expat-V11-00-00)
+- Change to new Markdown History format
+
+---
+
+# History entries prior to 11.0
+
 20-October-2020: Ben Morgan (expat-V10-06-00)
 - Migrate build of G4expat to locally defined targets, allowing
   cleaner specification of usage requirements. Fixes GitLab Issue #44.