Commit 8304ec26 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'fixOldG4VersionError' into 'master' 

Added precompiler check for Geant4 version, as G4FindDataDir() doesn't exist in older ones

See merge request allpix-squared/allpix-squared!1046
parents 3b2ec576 b20b10e2

src/modules/GeometryBuilderGeant4/GeometryBuilderGeant4Module.cpp

+4 −0
Original line number Diff line number Diff line
@@ -93,7 +93,11 @@ GeometryBuilderGeant4Module::GeometryBuilderGeant4Module(Configuration& config, 
 * @throws ModuleError If a certain Geant4 dataset is not set or not available

 */

static void check_dataset_g4(const std::string& env_name) {

#if G4VERSION_NUMBER >= 1110

    const char* file_name = G4FindDataDir(env_name.c_str());

#else

    const char* file_name = std::getenv(env_name.c_str());

#endif

    if(file_name == nullptr) {

        throw ModuleError("Geant4 environment variable " + env_name +

                          " is not set, make sure to source a Geant4 "