From 903a2434c1379fd2e87765d97e2fe9027716efb5 Mon Sep 17 00:00:00 2001 From: Marco Clemencic <marco.clemencic@cern.ch> Date: Mon, 2 Nov 2015 18:12:13 +0100 Subject: [PATCH] minor fix to handling of G4_NATIVE_VERSION --- Geant4/G4config/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Geant4/G4config/CMakeLists.txt b/Geant4/G4config/CMakeLists.txt index 873ade5..27c43cf 100644 --- a/Geant4/G4config/CMakeLists.txt +++ b/Geant4/G4config/CMakeLists.txt @@ -26,7 +26,10 @@ if(DEFINED ENV{G4_NATIVE_VERSION}) if(NOT Geant4_tag MATCHES "^4\\.") # G4_NATIVE_VERSION might not contain the initial '4.' that we need # see https://its.cern.ch/jira/browse/LHCBGAUSS-43 - set(Geant4_tag 4.${Geant4_version}) + set(Geant4_tag 4.${Geant4_tag}) + endif() + if(NOT Geant4_tag MATCHES "^geant") + set(Geant4_tag geant${Geant4_tag}) endif() else() set(Geant4_tag ${CMAKE_PROJECT_VERSION}) -- GitLab