Import Geant4 11.0.2 source tree

examples/extended/geometry/vecGeomNavigation/CMakeLists.txt

@@ -28,6 +28,14 @@ if(BUILTIN_G4VECGEOMNAV)
 
   FetchContent_GetProperties(g4vecgeomnav)
 
+  # G4VecGeomNav builds a shared lib by default. As this links to Geant4 libs, if Geant4 is 
+  # static-only, then we should also build G4VecGeomNav statically because:
+  # - Geant4 static libs are not guaranteed to be PIC
+  # - Geant4 symbols will be duplicated in g4vecgeomnav and the exampleVecGeomNac program
+  if(Geant4_static_FOUND AND (NOT Geant4_shared_FOUND))
+    set(BUILD_STATIC_LIBS ON)
+  endif()
+
   if(NOT g4vecgeomnav_POPULATED)
     FetchContent_Populate(g4vecgeomnav)
     message(STATUS "${g4vecgeomnav_SOURCE_DIR}, ${g4vecgeomnav_BINARY_DIR}")

examples/extended/geometry/vecGeomNavigation/History

@@ -14,6 +14,12 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+07/04/2022 B.Morgan (VecGeomNavigation-V10-07-03)
+- Build g4vecgeomnav as a static library if only Geant4 static libs are available
+
+25/03/2022 G.Cosmo
+- Removed unused setting of threads causing compilation warning.
+
 09/07/2021 G.Cosmo (VecGeomNavigation-V10-07-02)
 - Switched to use "master" for G4VecGeomNav package (instead of hardcoded
   hashed tag "1a002fbf2bccd81827b6100f86e2ad82433a75e9", used for 11.0-beta),

examples/extended/geometry/vecGeomNavigation/exampleVecGeomNav.cc

@@ -57,7 +57,6 @@ static G4bool       parCompareG4  = false;
 static G4bool       parInteractive = false;
 static std::string  parMacroFileName = "";
 static std::string  parGDMLFile = "TestNTST.gdml";
-static G4int        parThreads = 2;
 
 void GetInputArguments(int argc, char** argv);
 void PrintUsage();
@@ -71,9 +70,6 @@ int main(int argc, char** argv) {
         << "   Geant4 macro                =  " << parMacroFileName  << G4endl
         << "   Use VecGeom (VG) navigation =  " << parUseVecGeom     << G4endl
         << "   Compare G4 vs VG navigation =  " << parCompareG4      << G4endl
-#ifdef G4MULTITHREADED
-        << "   Number of threads           =  " << parThreads        << G4endl
-#endif
         << " ===================================================== " << G4endl;
 
   // Use custom stepping verbosity
@@ -175,9 +171,6 @@ void PrintUsage() {
             << " (and report differences.) \n"
             << "      and other(s): \n"
             << "       -g :   GDML file with geometry \n"
-#ifdef G4MULTITHREADED
-            << "       -t :   number of threads\n"
-#endif
             << "\n"
             << std::endl;
   horizontal_line('=');
@@ -218,11 +211,6 @@ void GetInputArguments(int argc, char** argv) {
          exit(1);
       }
     }
-#ifdef G4MULTITHREADED
-    else if ( G4String(argv[i]) == "-t" ) {
-      parThreads = G4UIcommand::ConvertToInt(argv[++i]);
-    }
-#endif
     else if ( G4String(argv[i]) == "-v" ) { parUseVecGeom = true; }
     else if ( G4String(argv[i]) == "-o" ) { parUseVecGeom = false; }
     else if ( G4String(argv[i]) == "-c" ) { parCompareG4 = true;  parUseVecGeom= true; }