Import Geant4 10.7.0 source tree

source/externals/zlib/History

@@ -19,6 +19,10 @@ committal in the CVS repository !
 History file for G4 zlib package
 --------------------------------
 
+29 October 2020 Ben Morgan (zlib-V10-06-01)
+- sources.cmake: remove include of obsolete CMake module,
+  update for full migration to new CMake system.
+
 28 May 2020 Ben Morgan (zlib-V10-06-00)
 - sources.cmake: Add needed include directories to G4zlib
   module when using new cmake system.

source/externals/zlib/sources.cmake

@@ -85,8 +85,6 @@ configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/src/zconf.h.cmakein
 #
 # Define the Geant4 Module.
 #
-include(Geant4MacroDefineModule)
-#
 #   headers listed under Sources are internal zlib headers
 #   Private headers are in src!
 include_directories(include)
@@ -137,9 +135,6 @@ GEANT4_DEFINE_MODULE(NAME G4zlib
     LINK_LIBRARIES
 )
 # List any source specific properties here
-# List any source specific properties here
-if(GEANT4_USE_NEW_CMAKE)
-  geant4_module_include_directories(G4zlib
-    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src;${CMAKE_CURRENT_BINARY_DIR}>
-    )
-endif()
+geant4_module_include_directories(G4zlib
+  PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src;${CMAKE_CURRENT_BINARY_DIR}>
+)