Import Geant4 10.4.0.beta source tree

source/externals/zlib/CMakeLists.txt

@@ -19,3 +19,21 @@ if(GEANT4_BUILD_GRANULAR_LIBS)
 else()
     GEANT4_GLOBAL_LIBRARY_TARGET(COMPONENTS sources.cmake)
 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 G4zlib target inside Geant4
+foreach(__g4zlib_target G4zlib G4zlib-static)
+  if(TARGET ${__g4zlib_target})
+    target_include_directories(${__g4zlib_target}
+      PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+    if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "6.99.99"))
+       target_compile_options(${__g4zlib_target} PRIVATE "-Wno-implicit-fallthrough")
+    endif()
+  endif()
+endforeach()
+

source/externals/zlib/History

@@ -19,6 +19,16 @@ committal in the CVS repository !
 
 History file for G4 zlib package
 --------------------------------
+18 May 2017 Gunter Folger   (zlib-V10-03-01)
+- disable warning on fall-through on many case statements issued by gcc7
+   add directive -Wno-implicit-fallthrough in CMakeLists.txt, and fix copy-paste typo.
+
+03 February 2017 Ben Morgan (zlib-V10-03-00)
+- Set interface include directories on G4zlib{-static} targets
+  in CMakeLists.txt. This provides the needed interface to allow transparent
+  usage of internal/external zlib via targets and without needing to use
+  include_directories explicitly. Only set include paths in BUILD
+  interface for consistency with other targets.
 
 19 April 2015 Gunter Folger   (zlib-V10-02-01)
 -  fix in gzguts.h for Windows; as of Studio 2015 in 64 bit compilation,