MT build changes

Geant4/G4config/CMakeLists.txt

@@ -54,6 +54,8 @@ ExternalProject_Add(Geant4
               -DGEANT4_USE_OPENGL=ON
               -DGEANT4_USE_OPENGL_X11=ON
               -DGEANT4_USE_RAYTRACER_X11=ON
+              -DGEANT4_BUILD_MULTITHREADED=ON
+              -DGEANT4_BUILD_TLS_MODEL=global-dynamic
               -DGEANT4_USE_NETWORKVRML=ON
               -DGEANT4_USE_NETWORKDAWN=ON
               -DGEANT4_USE_INVENTOR=OFF

LHCbG4PhysLists/CMakeLists.txt

@@ -4,6 +4,9 @@ gaudi_depends_on_subdirs(Geant4/G4config)
 
 find_package(CLHEP REQUIRED COMPONENTS Vector)
 
+add_definitions(-DG4MULTITHREADED)
+add_definitions(-DG4USE_STD11)
+
 include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS})
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 

LHCbG4Tests/G4GammaToDiLeptonConversionTest/CMakeLists.txt

@@ -8,6 +8,9 @@ find_package(CLHEP REQUIRED)
 include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS})
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 
+add_definitions(-DG4MULTITHREADED)
+add_definitions(-DG4USE_STD11)
+
 set(Geant4_LIBRARIES
     -lG4analysis
     -lG4physicslists

LHCbG4Tests/G4HadronicXSectionsTest/CMakeLists.txt

@@ -11,6 +11,9 @@ find_package(VDT REQUIRED)
 include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS})
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 
+add_definitions(-DG4MULTITHREADED)
+add_definitions(-DG4USE_STD11)
+
 set(Geant4_LIBRARIES
     -lG4analysis
     -lG4physicslists

LHCbG4Tests/G4MScInThinLayerTest/CMakeLists.txt

@@ -10,6 +10,9 @@ find_package(TBB)
 # Runtime dependency for ROOT (required for SLC6 as of LCG 96)
 find_package(LibLZMA REQUIRED)
 
+add_definitions(-DG4MULTITHREADED)
+add_definitions(-DG4USE_STD11)
+
 include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 

LHCbG4Tests/G4RichTbSimHTest/CMakeLists.txt

@@ -12,6 +12,9 @@ find_package(LibLZMA REQUIRED)
 include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 
+add_definitions(-DG4MULTITHREADED)
+add_definitions(-DG4USE_STD11)
+
 set(Geant4_LIBRARIES
     -lG4global
     -lG4run

LHCbG4Tests/G4SamplingCaloTest/CMakeLists.txt

@@ -8,6 +8,9 @@ find_package(CLHEP REQUIRED)
 include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS})
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
 
+add_definitions(-DG4MULTITHREADED)
+add_definitions(-DG4USE_STD11)
+
 set(Geant4_LIBRARIES
     -lG4analysis
     -lG4physicslists