Import Geant4 10.7.0.beta source tree

source/visualization/externals/CMakeLists.txt

@@ -1,18 +1,11 @@
 #------------------------------------------------------------------------------
-# CMakeLists.txt
 # Module : 
 # Package: Geant4.src.G4visualization.
-#
-# Intermediate level CMakeLists.txt - just process subdirectories
-#
-# Generated on : 24/9/2010
-#
-#
 #------------------------------------------------------------------------------
 
 #
 # GL2PS built for GL and Inventor drivers
 #
 if(GEANT4_USE_OPENGL OR GEANT4_USE_INVENTOR)
-    add_subdirectory(gl2ps)
+  add_subdirectory(gl2ps)
 endif()

source/visualization/externals/History

@@ -17,6 +17,9 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+12th December 2019 Ben Morgan (visexternals-V10-06-00)
+- visexternalgl2ps-V10-06-00: Remove no longer required dependence on OpenGLU
+
 20 February 2019 Ben Morgan (visexternals-V10-05-00)
 - visexternalgl2ps-V10-05-00: Add include path for generated G4GlobalConfig.hh
 

source/visualization/externals/gl2ps/CMakeLists.txt

@@ -1,13 +1,6 @@
 #------------------------------------------------------------------------------
-# CMakeLists.txt
 # Module : G4gl2ps
 # Package: Geant4.src.G4visualization.G4gl2ps
-#
-# CMakeLists.txt for single level library that may be build global or granular
-#
-# Generated on : 24/9/2010
-#
-#
 #------------------------------------------------------------------------------
 
 include(Geant4MacroLibraryTargets)

source/visualization/externals/gl2ps/History

@@ -16,6 +16,12 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+29 April 2020   Gunter Folger (visexternalgl2ps-V10-06-01)
+- (trivial) fix for clang10. Affects src/gl2ps.cc
+
+12th December 2019 Ben Morgan (visexternalgl2ps-V10-06-00)
+- Remove no longer required dependence on OpenGLU
+
 23rd October 2019 Ben Morgan (visexternalgl2ps-V10-05-03)
 - Only link to imported targets for OpenGL
 - Explicitly link to G4globman/G4global to use/propagate usage requirements.

source/visualization/externals/gl2ps/sources.cmake

@@ -1,17 +1,6 @@
 #-----------------------------------------------------------------------
-# sources.cmake
 # Module : G4gl2ps
 # Package: Geant4.src.G4visualization..G4gl2ps
-#
-# Sources description for a library.
-# Lists the sources and headers of the code explicitely.
-# Lists include paths needed.
-# Lists the internal granular and global dependencies of the library.
-# Source specific properties should be added at the end.
-#
-# Generated on : 24/9/2010
-#
-#
 #-----------------------------------------------------------------------
 
 # List external includes needed.
@@ -35,9 +24,9 @@ if(GEANT4_USE_INVENTOR)
   add_definitions(-DG4VIS_BUILD_OI_DRIVER)
 endif()
 
-set(G4GL2PS_GL_LIBRARIES OpenGL::GL OpenGL::GLU)
+set(G4GL2PS_GL_LIBRARIES OpenGL::GL)
 if(APPLE AND GEANT4_USE_OPENGL_X11)
-  list(APPEND G4GL2PS_GL_LIBRARIES XQuartzGL::GL XQuartzGL::GLU)
+  list(APPEND G4GL2PS_GL_LIBRARIES XQuartzGL::GL)
 endif()
 
 # Define the Geant4 Module.

source/visualization/externals/gl2ps/src/gl2ps.cc

@@ -4378,7 +4378,7 @@ static int gl2psPrintPDFShaderStreamDataCoord(GL2PSvertex *vertex,
   int offs = 0;
   unsigned long imap;
   GLfloat diff;
-  double dmax = ~1UL;
+  double dmax = (double) ~1UL;
   char edgeflag = 0;
 
   /* FIXME: temp bux fix for 64 bit archs: */
@@ -4421,7 +4421,7 @@ static int gl2psPrintPDFShaderStreamDataRGB(GL2PSvertex *vertex,
 {
   int offs = 0;
   unsigned long imap;
-  double dmax = ~1UL;
+  double dmax = (double) ~1UL;
 
   /* FIXME: temp bux fix for 64 bit archs: */
   if(sizeof(unsigned long) == 8) dmax = dmax - 2048.;
@@ -4446,7 +4446,7 @@ static int gl2psPrintPDFShaderStreamDataAlpha(GL2PSvertex *vertex,
 {
   int offs = 0;
   unsigned long imap;
-  double dmax = ~1UL;
+  double dmax = (double) ~1UL;
 
   /* FIXME: temp bux fix for 64 bit archs: */
   if(sizeof(unsigned long) == 8) dmax = dmax - 2048.;