Import Geant4 11.3.0.beta source tree

source/visualization/OpenInventor/sources.cmake

@@ -1,8 +1,15 @@
 # - G4OpenInventor module build definition
 # Define the Geant4 Module.
+
+#include "G4OpenInventorX.hh"          // no_geant4_module_check
+#include "G4OpenInventorXtExtended.hh" // no_geant4_module_check
+#include "G4OpenInventorQt.hh" // no_geant4_module_check
+#include "G4OpenInventorWin32.hh" // no_geant4_module_check
+
 geant4_add_module(G4OpenInventor
   PUBLIC_HEADERS
     G4OpenInventor.hh
+  PRIVATE_HEADERS
     G4OpenInventorSceneHandler.hh
     G4OpenInventorTransform3D.hh
     G4OpenInventorViewer.hh
@@ -38,21 +45,21 @@ geant4_module_compile_definitions(G4OpenInventor PUBLIC G4VIS_USE_OI)
 
 geant4_module_link_libraries(G4OpenInventor
   PUBLIC
+    G4vis_management
+  PRIVATE
     G4UIcore
+    G4UIimplementation
+    G4csg
+    G4geometrymng
     G4globman
     G4graphics_reps
     G4hepgeometry
     G4intercoms
-    G4modeling
-    G4vis_management
-    Coin::Coin
-  PRIVATE
-    G4UIimplementation
-    G4csg
-    G4geometrymng
-    G4tools
     G4materials
-    G4tracking)
+    G4modeling
+    G4tools
+    G4tracking
+    Coin::Coin)
 
 # UNIX Only (Xt) sources
 if(GEANT4_USE_INVENTOR_XT)
@@ -60,9 +67,10 @@ if(GEANT4_USE_INVENTOR_XT)
     PUBLIC_HEADERS
       G4OpenInventorX.hh
       G4OpenInventorXt.hh
+      G4OpenInventorXtExtended.hh
+    PRIVATE_HEADERS
       G4OpenInventorXtExaminerViewerMessenger.hh
       G4OpenInventorXtExaminerViewer.hh
-      G4OpenInventorXtExtended.hh
       G4OpenInventorXtExtendedViewer.hh
       G4OpenInventorXtViewer.hh
       wheelmouse.h
@@ -86,11 +94,11 @@ if(GEANT4_USE_INVENTOR_XT)
     PUBLIC G4VIS_USE_OIX
     PRIVATE G4VIS_BUILD_OIX_DRIVER)
 
-  geant4_module_link_libraries(G4OpenInventor PUBLIC SoXt::SoXt Motif::Xm)
+  geant4_module_link_libraries(G4OpenInventor PRIVATE SoXt::SoXt Motif::Xm)
   if(APPLE)
-    geant4_module_link_libraries(G4OpenInventor PUBLIC XQuartzGL::GL)
+    geant4_module_link_libraries(G4OpenInventor PRIVATE XQuartzGL::GL)
   else()
-    geant4_module_link_libraries(G4OpenInventor PUBLIC OpenGL::GL)
+    geant4_module_link_libraries(G4OpenInventor PRIVATE OpenGL::GL)
   endif()
 endif()
 
@@ -99,6 +107,7 @@ if(GEANT4_USE_INVENTOR_QT)
   geant4_module_sources(G4OpenInventor
     PUBLIC_HEADERS
       G4OpenInventorQt.hh
+    PRIVATE_HEADERS
       G4OpenInventorQtExaminerViewer.hh
       G4OpenInventorQtViewer.hh
       G4SoQt.hh
@@ -111,10 +120,15 @@ if(GEANT4_USE_INVENTOR_QT)
 
   geant4_module_compile_definitions(G4OpenInventor PUBLIC G4VIS_USE_OIQT)
 
-  geant4_module_link_libraries(G4OpenInventor PUBLIC SoQt::SoQt OpenGL::GL Qt${QT_VERSION_MAJOR}::OpenGL Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets)
+  geant4_module_link_libraries(G4OpenInventor PRIVATE SoQt::SoQt OpenGL::GL Qt${QT_VERSION_MAJOR}::OpenGL Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets)
 
   geant4_set_module_property(G4OpenInventor PROPERTY AUTOMOC ON)
-
+  # Minor hack for MOC-ing. Qt's moc requires visibility of the private headers
+  # - Will not affect external consumers and should be minimal impact interanally
+  #   as this is a leaf category
+  geant4_module_include_directories(G4OpenInventor
+    PRIVATE
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/private>)
 endif()
 
 # - WIN32 Only (Win32) sources
@@ -123,6 +137,7 @@ if(GEANT4_USE_INVENTOR_WIN)
     PUBLIC_HEADERS
       G4OpenInventorWin.hh
       G4OpenInventorWin32.hh
+    PRIVATE_HEADERS
       G4OpenInventorWinViewer.hh
     SOURCES
       G4OpenInventorWin.cc
@@ -130,5 +145,5 @@ if(GEANT4_USE_INVENTOR_WIN)
   
   geant4_module_compile_definitions(G4OpenInventor PUBLIC G4VIS_USE_OIWIN32)
   
-  geant4_module_link_libraries(G4OpenInventor PUBLIC SoWin::SoWin OpenGL::GL)
+  geant4_module_link_libraries(G4OpenInventor PRIVATE SoWin::SoWin OpenGL::GL)
 endif()