Import Geant4 10.7.0 source tree

source/visualization/externals/gl2ps/sources.cmake

@@ -3,17 +3,6 @@
 # Package: Geant4.src.G4visualization..G4gl2ps
 #-----------------------------------------------------------------------
 
-# List external includes needed.
-include_directories(${CLHEP_INCLUDE_DIRS})
-include_directories(${ZLIB_INCLUDE_DIRS})
-
-# List internal includes needed.
-include_directories(${PROJECT_SOURCE_DIR}/source/global/management/include)
-# WORKAROUND: Now have a generated header, so must add include directory,
-# but not that we lose one directory level because the management subcategory
-# is merged into the main global one!
-include_directories(${PROJECT_BINARY_DIR}/source/global/include)
-
 # We need to add definitions depending on what GL drivers are built
 #
 if(GEANT4_USE_OPENGL)
@@ -24,14 +13,14 @@ if(GEANT4_USE_INVENTOR)
   add_definitions(-DG4VIS_BUILD_OI_DRIVER)
 endif()
 
+# Link to appropriate GL library for the platform/drivers being built
 set(G4GL2PS_GL_LIBRARIES OpenGL::GL)
-if(APPLE AND GEANT4_USE_OPENGL_X11)
-  list(APPEND G4GL2PS_GL_LIBRARIES XQuartzGL::GL)
+if(APPLE AND (GEANT4_USE_OPENGL_X11 OR GEANT4_USE_INVENTOR_XT OR GEANT4_USE_XM))
+  set(G4GL2PS_GL_LIBRARIES XQuartzGL::GL)
 endif()
 
 # Define the Geant4 Module.
 #
-include(Geant4MacroDefineModule)
 GEANT4_DEFINE_MODULE(NAME G4gl2ps
   HEADERS
     G4OpenGL2PSAction.hh