Import Geant4 11.2.1 source tree

cmake/Modules/G4ConfigurePkgConfigHelpers.cmake

@@ -262,6 +262,9 @@ if(NOT GEANT4_BUILD_GRANULAR_LIBS)
       set(G4_QT_CFLAGS "${G4_QT_CFLAGS} -I${_dir}")
     endforeach()
 
+    if(APPLE AND G4_QT_CFLAGS MATCHES "QtCore\.framework")
+      set(G4_QT_CFLAGS "${G4_QT_CFLAGS} -F${G4QTLIBPATH}")
+    endif()
   else()
     set(G4_BUILTWITH_QT "no")
   endif()

cmake/Modules/G4InterfaceOptions.cmake

@@ -138,16 +138,28 @@ if(GEANT4_USE_INVENTOR)
   find_package(Coin 4.0.0 REQUIRED)
   geant4_save_package_variables(Inventor Coin_DIR)
 
+  # Helper to hand-check version because SoXXX use an exact version strategy
+  # in their CMake config files
+  function(check_sobind_version _binding _minversion)
+    if(${_binding}_VERSION VERSION_LESS "${_minversion}")
+      message(FATAL_ERROR "Found ${_binding}, version: ${${_binding}_VERSION}, but Geant4 requires versions >= ${_minversion}\n"
+        "${_binding} found at:\n  ${${_binding}_DIR}\n")
+    endif()
+  endfunction()
+
   if(GEANT4_USE_INVENTOR_QT)
-    find_package(SoQt 1.6.0 REQUIRED)
+    find_package(SoQt REQUIRED)
+    check_sobind_version(SoQt 1.6.0)
     geant4_save_package_variables(Inventor SoQt_DIR)
   else()
     if(UNIX)
       find_package(SoXt 1.4.0 REQUIRED)
+      check_sobind_version(SoXt 1.4.0)
       geant4_save_package_variables(Inventor SoXt_DIR)
       set(GEANT4_USE_INVENTOR_XT ON)
     elseif(WIN32)
       find_package(SoWin 1.4.0 REQUIRED)
+      check_sobind_version(SoWin 1.4.0)
       geant4_save_package_variables(Inventor SoWin_DIR)
       set(GEANT4_USE_INVENTOR_WIN ON)
     endif()