From 395c631d46d13c050b84344a6b9e3783cc1708ae Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Tue, 3 Mar 2015 19:24:24 +0100
Subject: [PATCH] v95r2p7g3
---
CMakeLists.txt | 3 ++-
cmt/project.cmt | 3 ++-
toolchain.cmake | 12 +-----------
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17c9dfe..0e4857f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,8 @@ if(DEFINED ENV{G4_NATIVE_VERSION})
endif()
find_package(GaudiProject)
-gaudi_project(Geant4 v95r2p7g2)
+gaudi_project(Geant4 v95r2p7g3
+ DATA Geant4Files VERSION v95r*)
file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../include ${CMAKE_INSTALL_PREFIX}/include)
diff --git a/cmt/project.cmt b/cmt/project.cmt
index 5de0a4b..229c7cd 100755
--- a/cmt/project.cmt
+++ b/cmt/project.cmt
@@ -1,6 +1,7 @@
project GEANT4
-use GAUDI GAUDI_v25r2
+use GAUDI GAUDI_v25r6
+use PARAM
build_strategy with_installarea
setup_strategy root
diff --git a/toolchain.cmake b/toolchain.cmake
index bc11cb7..b642413 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -1,11 +1 @@
-# Special wrapper to load the declared version of the heptools toolchain.
-set(heptools_version 68)
-
-find_file(use_heptools_module UseHEPTools.cmake
- HINTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-# this check is needed because the toolchain seem to be called a second time
-# without the proper cache
-if(use_heptools_module)
- include(${use_heptools_module})
- use_heptools(${heptools_version})
-endif()
+include($ENV{LBUTILSROOT}/data/toolchain.cmake)
--
GitLab