Import Geant4 11.1.0 source tree

source/visualization/ToolsSG/sources.cmake

@@ -5,13 +5,14 @@ geant4_add_module(G4ToolsSG
     G4ToolsSGNode.hh
     G4ToolsSGSceneHandler.hh
     G4ToolsSGViewer.hh
+    G4ToolsSGOffscreen.hh
+    G4ToolsSGOffscreenViewer.hh
   SOURCES
-    G4ToolsSGSceneHandler.cc)
+    G4ToolsSGSceneHandler.cc
+    G4ToolsSGOffscreen.cc)
 
 geant4_module_link_libraries(G4ToolsSG
   PUBLIC
-    G4UIbasic
-    G4UIcommon
     G4intercoms
     G4modeling
     G4vis_management
@@ -35,6 +36,18 @@ endif()
 if(GEANT4_USE_TOOLSSG_XT_GLES)
   geant4_module_sources(G4ToolsSG PUBLIC_HEADERS G4ToolsSGXtGLES.hh SOURCES G4ToolsSGXtGLES.cc)
   geant4_module_compile_definitions(G4ToolsSG PRIVATE TOOLS_USE_GL_GL_H)
+
+  # A minor hack around a likely issue in geant4_module_link_libraries
+  # When Qt is activated, G4UIcommon is a public dependency. CMake will deduplicate
+  # this (in favour of PUBLIC at final library link time, but geant4_module_link_libraries
+  # does not do this internally yet (To be checked). We then get validation
+  # warnings on duplicated deps. NB: Also demonstrates awkward vis system of more than
+  # one driver per library...
+  if(GEANT4_USE_TOOLSSG_QT_GLES)
+    geant4_module_link_libraries(G4ToolsSG PUBLIC G4UIcommon)
+  else()
+    geant4_module_link_libraries(G4ToolsSG PRIVATE G4UIcommon)
+  endif()
 endif()
 
 # X11/Xt links if selected
@@ -57,7 +70,15 @@ if(GEANT4_USE_TOOLSSG_QT_GLES)
       G4ToolsSGQtGLES.cc
       G4ToolsSGQtViewer.cc)
 
-  geant4_module_link_libraries(G4ToolsSG PUBLIC Qt${QT_VERSION_MAJOR}::OpenGL Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::PrintSupport Qt${QT_VERSION_MAJOR}::Widgets OpenGL::GL)
+  geant4_module_link_libraries(G4ToolsSG 
+    PUBLIC 
+      Qt${QT_VERSION_MAJOR}::OpenGL
+      Qt${QT_VERSION_MAJOR}::Gui
+      Qt${QT_VERSION_MAJOR}::PrintSupport
+      Qt${QT_VERSION_MAJOR}::Widgets 
+      OpenGL::GL
+      G4UIbasic
+      G4UIcommon)
 endif()
 
 # Windows sources if selected