Import Geant4 11.0.0.beta source tree

source/visualization/externals/CMakeLists.txt

@@ -1,11 +1,4 @@
-#------------------------------------------------------------------------------
-# Module : 
-# Package: Geant4.src.G4visualization.
-#------------------------------------------------------------------------------
-
-#
-# GL2PS built for GL and Inventor drivers
-#
+# - gl2ps only needed if OGL drivers enabled
 if(GEANT4_USE_OPENGL OR GEANT4_USE_INVENTOR)
   add_subdirectory(gl2ps)
 endif()

source/visualization/externals/History

@@ -17,6 +17,13 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+14 April 2021 Ben Morgan (visexternals-V10-07-01)
+- Migrate gl2ps build to modular CMake system
+
+05 March 20201  John Allison  (visexternals-V10-07-00)
+- gl2ps.h: Allow use of non-APPLE OpenGL on APPLE.
+  o To use this, build with cpp macro GL2PS_USE_GL_GL_H.
+
 01 July 2020  John Allison  (visexternals-V10-06-01)
 - gl2ps.cc: Fix Coverity warning.
 

source/visualization/externals/gl2ps/CMakeLists.txt

@@ -1,12 +1,3 @@
-#------------------------------------------------------------------------------
-# Module : G4gl2ps
-# Package: Geant4.src.G4visualization.G4gl2ps
-#------------------------------------------------------------------------------
-
-include(Geant4MacroLibraryTargets)
-if(GEANT4_BUILD_GRANULAR_LIBS)
-    GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
-else()
-    GEANT4_GLOBAL_LIBRARY_TARGET(COMPONENTS sources.cmake)
-endif()
+# - G4gl2ps category build
 
+geant4_global_library_target(COMPONENTS sources.cmake)

source/visualization/externals/gl2ps/include/gl2ps.h

@@ -89,10 +89,18 @@
 #  define GL2PSDLL_API
 #endif
 
-#if defined(__APPLE__) || defined(HAVE_OPENGL_GL_H)
+#if defined(HAVE_OPENGL_GL_H)
 #  include <OpenGL/gl.h>
 #else
-#  include <GL/gl.h>
+#  if defined(__APPLE__)
+#    ifdef GL2PS_USE_GL_GL_H
+#      include <GL/gl.h>
+#    else
+#      include <OpenGL/gl.h>
+#    endif
+#  else
+#    include <GL/gl.h>
+#  endif
 #endif
 
 /* Support for compressed PostScript/PDF/SVG and for embedded PNG

source/visualization/externals/gl2ps/sources.cmake

@@ -1,10 +1,6 @@
-#-----------------------------------------------------------------------
-# Module : G4gl2ps
-# Package: Geant4.src.G4visualization..G4gl2ps
-#-----------------------------------------------------------------------
+# - G4gl2ps module build definition
 
 # We need to add definitions depending on what GL drivers are built
-#
 if(GEANT4_USE_OPENGL)
   add_definitions(-DG4VIS_BUILD_OPENGL_DRIVER)
 endif()
@@ -19,26 +15,19 @@ 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.
-#
-GEANT4_DEFINE_MODULE(NAME G4gl2ps
-  HEADERS
+# Define the Geant module
+geant4_add_module(G4gl2ps
+  PUBLIC_HEADERS
     G4OpenGL2PSAction.hh
     Geant4_gl2ps.h
     gl2ps.h
   SOURCES
     G4OpenGL2PSAction.cc
-    gl2ps.cc
-  GRANULAR_DEPENDENCIES
+    gl2ps.cc)
+
+geant4_module_link_libraries(G4gl2ps
+  PUBLIC
     G4globman
-  GLOBAL_DEPENDENCIES
-    G4global
-  LINK_LIBRARIES
     ${ZLIB_LIBRARIES}
-    ${G4GL2PS_GL_LIBRARIES}
-  SOURCES_EXCLUDE_FORMAT
-    gl2ps.h
-  )
-
-# List any source specific properties here
+    ${G4GL2PS_GL_LIBRARIES})