Import Geant4 10.5.0 source tree

cmake/Modules/FindInventor.cmake

@@ -213,24 +213,48 @@ if(UNIX)
     PATHS ${INVENTOR_LIB_SEARCH_PATH}
     )
 
-  # try to find SoXt debug lib (priority paths)
-  #FIND_LIBRARY(INVENTOR_SOXT_LIBRARY_DEBUG
-  #  NAMES soxt1d
-  #  PATHS ${SOXT_PREFIX}/lib
-  #  $ENV{COINDIR}/lib
-  #  NO_DEFAULT_PATH
-  #  )
+  #
+  #  SoQt
+  #
+  #  notes:
+  #  - SoQt is detected by soqt-config script (as expected by
+  #    Coin's SoQt on Linux/Unix) and on standard system locations
+  #
 
-  # try to find SoXt debug lib (regular paths)
-  #FIND_LIBRARY(INVENTOR_SOXT_LIBRARY_DEBUG
-  #  NAMES soxt1d
-  #  PATHS ${INVENTOR_LIB_SEARCH_PATH}
-  #  )
+  # soqt-config tells much of SoQt installation (if present)
+  execute_process (COMMAND soqt-config --prefix
+    OUTPUT_VARIABLE SOQT_PREFIX
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  # try to find Inventor includes (priority paths from coin-config and COINDIR)
+  FIND_PATH(INVENTOR_SOQT_INCLUDE_DIR Inventor/Qt/SoQt.h
+    ${SOQT_PREFIX}/include
+    $ENV{COINDIR}/include
+    NO_DEFAULT_PATH
+  )
+
+  # try to find Inventor includes (system paths)
+  FIND_PATH(INVENTOR_SOQT_INCLUDE_DIR Inventor/Qt/SoQt.h
+    /usr/local/include
+    /usr/include
+    /sw/include
+    /opt/local/include
+    /opt/csw/include
+    /opt/include
+  )
+
+  # try to find SoQt lib (priority paths)
+  FIND_LIBRARY(INVENTOR_SOQT_LIBRARY
+    NAMES soqt1 SoQt
+    PATHS ${SOQT_PREFIX}/lib
+    $ENV{COINDIR}/lib
+    NO_DEFAULT_PATH
+    )
+
+  # try to find SoQt lib (regular paths)
+  FIND_LIBRARY(INVENTOR_SOQT_LIBRARY
+    NAMES soqt1 SoQt
+    PATHS ${INVENTOR_LIB_SEARCH_PATH}
+    )
 
-  # SoXt debug library defaults to non-debug lib
-  #IF(NOT INVENTOR_SOXT_LIBRARY_DEBUG)
-  #  IF(INVENTOR_SOXT_LIBRARY)
-  #    SET(INVENTOR_SOXT_LIBRARY_DEBUG INVENTOR_SOXT_LIBRARY)
-  #  ENDIF(INVENTOR_SOXT_LIBRARY)
-  #ENDIF(NOT INVENTOR_SOXT_LIBRARY_DEBUG)
 endif()

cmake/Modules/G4BuildSettings.cmake

@@ -197,8 +197,6 @@ endif()
 # Smart pointers are a library implementation feature
 # Hashed containers are a library implementation feature
 # Random numbers are a library implementation feature?
-# - Thread local? Yes, though on AppleClang platforms, see this:
-  #http://stackoverflow.com/questions/28094794/why-does-apple-clang-disallow-c11-thread-local-when-official-clang-supports
 # An example of where a workaround is needed
 # Rest of concurrency a library implementation feature
 

cmake/Modules/Geant4DatasetDefinitions.cmake

@@ -18,41 +18,41 @@ geant4_add_dataset(
 # - Low energy electromagnetics
 geant4_add_dataset(
   NAME      G4EMLOW
-  VERSION   7.4
+  VERSION   7.7
   FILENAME  G4EMLOW
   EXTENSION tar.gz
   ENVVAR    G4LEDATA
-  MD5SUM    a4443411b1a8782640b6eec691e7c25f
+  MD5SUM    0f650ea65c028e862a05293c10ec1089
   )
 
 # - Photon evaporation
 geant4_add_dataset(
   NAME      PhotonEvaporation
-  VERSION   5.2
+  VERSION   5.3
   FILENAME  G4PhotonEvaporation
   EXTENSION tar.gz
   ENVVAR    G4LEVELGAMMADATA
-  MD5SUM    37c5dea9614a07885050350d071a6973
+  MD5SUM    8991682af997e71bdd87f72ee3b3e9ee
   )
 
 # - Radioisotopes
 geant4_add_dataset(
   NAME      RadioactiveDecay
-  VERSION   5.2
+  VERSION   5.3
   FILENAME  G4RadioactiveDecay
   EXTENSION tar.gz
   ENVVAR    G4RADIOACTIVEDATA
-  MD5SUM    e035ed77e12be3a69c2d32806d1b5cde
+  MD5SUM    ce1fe5e4d82d1a2ce89380e5e7e16cc8
   )
 
-# - Neutron XS
+# - Particle XS - replaces Neutron XS
 geant4_add_dataset(
-  NAME      G4NEUTRONXS
-  VERSION   2.0
-  FILENAME  G4NEUTRONXS
+  NAME      G4PARTICLEXS
+  VERSION   1.1
+  FILENAME  G4PARTICLEXS
   EXTENSION tar.gz
-  ENVVAR    G4NEUTRONXSDATA
-  MD5SUM    c3af588c26522f289ec60dcb7c847ade
+  ENVVAR    G4PARTICLEXSDATA
+  MD5SUM    17dc6c6f11db7ca81dea1c2c2b3707d2
   )
 
 # - PII
@@ -78,11 +78,11 @@ geant4_add_dataset(
 # - SAID
 geant4_add_dataset(
   NAME      G4SAIDDATA
-  VERSION   1.1
+  VERSION   2.0
   FILENAME  G4SAIDDATA
   EXTENSION tar.gz
   ENVVAR    G4SAIDXSDATA
-  MD5SUM    d88a31218fdf28455e5c5a3609f7216f
+  MD5SUM    d5d4e9541120c274aeed038c621d39da
   )
 
 # - ABLA
@@ -95,6 +95,17 @@ geant4_add_dataset(
   MD5SUM    180f1f5d937733b207f8d5677f76296e
   )
 
+
+# - INCL
+geant4_add_dataset(
+  NAME      G4INCL
+  VERSION   1.0
+  FILENAME  G4INCL
+  EXTENSION tar.gz
+  ENVVAR    G4INCLDATA
+  MD5SUM    85fe937b6df46d41814f07175d3f5b51
+  )
+
 # - ENSDFSTATE
 geant4_add_dataset(
   NAME      G4ENSDFSTATE

cmake/Modules/Geant4InstallData.cmake

@@ -99,7 +99,7 @@
 # retrieving them globally
 #-----------------------------------------------------------------------
 # Geant4 Data Repository
-set(GEANT4_DATASETS_URL "http://cern.ch/geant4-data/datasets")
+set(GEANT4_DATASETS_URL "https://cern.ch/geant4-data/datasets")
 
 # Where to install data in the build tree
 set(GEANT4_BUILD_FULL_DATADIR ${PROJECT_BINARY_DIR}/data)

cmake/Modules/Geant4InterfaceOptions.cmake

@@ -52,6 +52,11 @@ if(GEANT4_USE_INVENTOR)
     if(NOT INVENTOR_SOXT_LIBRARY OR NOT INVENTOR_SOXT_INCLUDE_DIR)
       message(FATAL_ERROR "Could not find SoXt library and/or headers")
     endif()
+    if (GEANT4_USE_INVENTOR_QT)
+      if (NOT INVENTOR_SOQT_LIBRARY OR NOT INVENTOR_SOQT_INCLUDE_DIR)
+        message(FATAL_ERROR "Could not find SoQt library and/or headers")
+      endif()
+    endif()
     set(INVENTOR_INCLUDE_DIR "${INVENTOR_INCLUDE_DIR}" "${INVENTOR_SOXT_INCLUDE_DIR}")
     find_package(Motif REQUIRED)
     find_package(X11 REQUIRED)

cmake/Modules/Geant4MakeRules_cxx.cmake

@@ -41,9 +41,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
   set(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
 
-  # Remove superfluous "unused argument" "warnings" from Clang
+  # Remove superfluous "unused argument" and "GL deprecation" "warnings" from Clang
   if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
-    set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -Qunused-arguments")
+    set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} -Qunused-arguments -DGL_SILENCE_DEPRECATION")
   endif()
 
   # Though it should be the default, always use libc++ with AppleClang

cmake/Modules/genwindef/genwindef.cpp

@@ -1,81 +1,80 @@
-//$Id: genconf.cpp,v 1.35 2008/10/15 21:51:24 marcocle Exp $	//
-
-#ifdef _WIN32
-  // Disable a warning in Boost program_options headers:
-  // inconsistent linkage in program_options/variables_map.hpp
-  #pragma warning ( disable : 4273 )
-  #define popen _popen
-  #define pclose _pclose 
-  #define fileno _fileno 
-  #include <stdlib.h>
-#endif
-
-// Include files----------------------------------------------------------------
-#include <vector>
-#include <string>
-#include <iostream>
-#include <fstream>
-#include "LibSymbolInfo.h"
-
-using namespace std;
-
-namespace windef {
-  void usage(){
-    cerr << "Usage: genwindef [-l <dllname>] [-o <output-file> | exports.def]  <obj or lib filenames>" << endl;
-    exit(1);
-  }
-}
-
-//--- Command main program-----------------------------------------------------
-int main ( int argc, char** argv )
-//-----------------------------------------------------------------------------
-{
-  string outfile("exports.def");
-  string library("UnknownLib");
-  string objfiles;
-  bool debug(false);
-
-  int arg;
-  if (argc < 3) windef::usage();
-  arg = 1;
-  while (argv[arg][0] == '-') {
-    if (strcmp(argv[arg], "--") == 0) {
-      windef::usage();
-    } 
-    else if (strcmp(argv[arg], "-l") == 0) {
-      arg++; 
-      if (arg == argc) windef::usage();
-      library = argv[arg];
-    } 
-    else if (strcmp(argv[arg], "-o") == 0) {
-      arg++; 
-      if (arg == argc) windef::usage();
-      outfile = argv[arg];
-    } 
-    arg++;
-  }
-  if (arg == argc) windef::usage();
-  for (arg; arg < argc; arg++) {
-     objfiles += argv[arg];
-     if( arg+1 < argc) objfiles += " ";
-  }
-
-  CLibSymbolInfo libsymbols;
-  ofstream out(outfile.c_str());
-  if(out.fail()) {
-    cerr << "windef: Error opening file " << outfile << endl;
-    return 1;
-  }
-  out << "LIBRARY " << library << endl;
-  out << "EXPORTS" << endl;
-
-  libsymbols.DumpSymbols(const_cast<char*>(objfiles.c_str()), out);
-
-  out.close();
-
-
-  return 0;
-}
-
-
-
+
+#ifdef _WIN32
+  // Disable a warning in Boost program_options headers:
+  // inconsistent linkage in program_options/variables_map.hpp
+  #pragma warning ( disable : 4273 )
+  #define popen _popen
+  #define pclose _pclose 
+  #define fileno _fileno 
+  #include <stdlib.h>
+#endif
+
+// Include files----------------------------------------------------------------
+#include <vector>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include "LibSymbolInfo.h"
+
+using namespace std;
+
+namespace windef {
+  void usage(){
+    cerr << "Usage: genwindef [-l <dllname>] [-o <output-file> | exports.def]  <obj or lib filenames>" << endl;
+    exit(1);
+  }
+}
+
+//--- Command main program-----------------------------------------------------
+int main ( int argc, char** argv )
+//-----------------------------------------------------------------------------
+{
+  string outfile("exports.def");
+  string library("UnknownLib");
+  string objfiles;
+  bool debug(false);
+
+  int arg;
+  if (argc < 3) windef::usage();
+  arg = 1;
+  while (argv[arg][0] == '-') {
+    if (strcmp(argv[arg], "--") == 0) {
+      windef::usage();
+    } 
+    else if (strcmp(argv[arg], "-l") == 0) {
+      arg++; 
+      if (arg == argc) windef::usage();
+      library = argv[arg];
+    } 
+    else if (strcmp(argv[arg], "-o") == 0) {
+      arg++; 
+      if (arg == argc) windef::usage();
+      outfile = argv[arg];
+    } 
+    arg++;
+  }
+  if (arg == argc) windef::usage();
+  for (arg; arg < argc; arg++) {
+     objfiles += argv[arg];
+     if( arg+1 < argc) objfiles += " ";
+  }
+
+  CLibSymbolInfo libsymbols;
+  ofstream out(outfile.c_str());
+  if(out.fail()) {
+    cerr << "windef: Error opening file " << outfile << endl;
+    return 1;
+  }
+  out << "LIBRARY " << library << endl;
+  out << "EXPORTS" << endl;
+
+  libsymbols.DumpSymbols(const_cast<char*>(objfiles.c_str()), out);
+
+  out.close();
+
+
+  return 0;
+}
+
+
+