Import Geant4 10.7.1 source tree

source/externals/CMakeLists.txt

@@ -19,8 +19,7 @@ endif()
 
 # PTL requires additional pre and post inclusion steps as it's a true subproject
 if(NOT GEANT4_USE_SYSTEM_PTL)
-  set(CMAKE_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}
-        CACHE PATH "CMake install directory" FORCE)
+  set(CMAKE_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}-${${PROJECT_NAME}_VERSION}/PTL)
   add_subdirectory(ptl)
   # Needs to be in defined category list for static/shared to be linked correctly.
   set_property(GLOBAL APPEND PROPERTY GEANT4_DEFINED_CATEGORIES G4ptl)

source/externals/History

@@ -16,6 +16,11 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+8 December 2020 - B.Morgan (externals-V10-06-06)
+- Force PTL to install its CMake configuration files within the directory
+  where Geant4 installs its own.
+- Force PTL to install its headers under CMAKE_INSTALL_INCLUDEDIR/Geant4
+
 11 November 2020 - G.Cosmo (externals-V10-06-05)
 - Synchronised with CLHEP-2.4.4.0:
   o Removed obsolete #pragma interface/implementation in Vector classes.

source/externals/ptl/CMakeLists.txt

@@ -13,6 +13,7 @@ cmake_policy(SET CMP0042 NEW)
 set(PTL_MASTER_PROJECT ON)
 if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
   set(PTL_MASTER_PROJECT OFF)
+  set(CMAKE_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/Geant4")
 endif()
 
 ################################################################################
@@ -37,7 +38,7 @@ set(CMAKE_DIRECTORY_LABELS "PTL")
 #
 #
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/Modules ${CMAKE_MODULE_PATH})
-set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development)
+set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME Development)
 
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
     set(CMAKE_BUILD_TYPE Release CACHE STRING "CMake build type" FORCE)
@@ -138,20 +139,20 @@ endif()
 # Install the targets and export libraries
 install(TARGETS ${INSTALL_LIBRARIES}
     EXPORT ${PROJECT_NAME}Targets
-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT development
-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT runtime
-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime)
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT Development
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT Runtime
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT Runtime)
 
 # install export
 install(EXPORT ${PROJECT_NAME}Targets
     NAMESPACE PTL::
     DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
-    COMPONENT development)
+    COMPONENT Development)
 
 # headers
 install(FILES ${ptl_headers}
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/PTL
-    COMPONENT development)
+    COMPONENT Development)
 
 # set
 set(PTL_BUILT_LIBRARIES "${INSTALL_LIBRARIES}" CACHE INTERNAL "Built libraries" FORCE)

source/externals/ptl/History

@@ -16,6 +16,15 @@ committal in the code repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+22 Jan 2021 - B.Morgan (ptl-V10-06-10)
+- Apply patch from Gunter to fix component installs on Windows
+
+8 Nov 2020 - B.Morgan (ptl-V10-06-09)
+- Force installation of PTL headers to CMAKE_INSTALL_INCLUDEDIR/Geant4, following
+  behaviour for other builtins
+- Don't override CMAKE_INSTALL_CONFIGDIR variable as this should be set in the parent
+  directory.
+
 2 Nov 2020 - B.Morgan (ptl-V10-06-08)
 - BUGFIX #2286: Install PTL DLL/archive into appropriate platform dependent
   locations.

source/externals/ptl/cmake/Modules/BuildSettings.cmake

@@ -25,7 +25,7 @@ ptl_add_interface_library(ptl-external-libraries)
 if("${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}")
     set(_BIN_DIR ${PROJECT_BINARY_DIR})
     if(WIN32)
-        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${_BIN_DIR}/outputs/runtime)
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${_BIN_DIR}/outputs/Runtime)
         set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${_BIN_DIR}/outputs/library)
         set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${_BIN_DIR}/outputs/archive)
     else()

source/externals/ptl/cmake/Modules/MacroUtilities.cmake

@@ -951,7 +951,7 @@ FUNCTION(PTL_ADD_INTERFACE_LIBRARY _TARGET)
         install(TARGETS ${_TARGET}
             DESTINATION ${CMAKE_INSTALL_LIBDIR}
             EXPORT ${PROJECT_NAME}Targets
-            COMPONENT development)
+            COMPONENT Development)
     endif()
 ENDFUNCTION()
 

source/externals/ptl/cmake/Modules/ProjectSettings.cmake

@@ -16,7 +16,10 @@ add_feature(CMAKE_CXX_FLAGS_${_CONFIG} "C++ compiler build-specific flags")
 ################################################################################
 
 # cmake installation folder
-set(CMAKE_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+if(NOT CMAKE_INSTALL_CONFIGDIR)
+  set(CMAKE_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
+endif()
+
 
 # create the full path version and generic path versions
 foreach(_TYPE in DATAROOT CMAKE INCLUDE LIB BIN MAN DOC)