Skip to content
Snippets Groups Projects
Commit e5e4dea7 authored by Dmitry Popov's avatar Dmitry Popov
Browse files

Merge branch 'v106r2p3-release' into 'Sim10'

v106r2p3 release

See merge request !69
parents 5099de42 4f15a4a7
No related branches found
No related tags found
1 merge request!69v106r2p3 release
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
# NO_NINJA : Geant4 build fails with Ninja
set(GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING "Repository for Geant4 sources")
set(GEANT4FILES_VERSION v106r1 CACHE STRING "Version for Geant4Files to match Geant4-src version")
find_package(GaudiProject)
gaudi_project(Geant4 v106r2p2
gaudi_project(Geant4 v106r2p3
DATA Geant4Files VERSION ${GEANT4FILES_VERSION})
# FIXME: hack for compatibility with CMT build
......
......@@ -57,7 +57,7 @@ ExternalProject_Add(Geant4
-DGEANT4_USE_NETWORKVRML=ON
-DGEANT4_USE_NETWORKDAWN=ON
-DGEANT4_USE_INVENTOR=OFF
-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/$ENV{CMTCONFIG}
-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/${BINARY_TAG}
-DCMAKE_INSTALL_LIBDIR=lib
-DGEANT4_INSTALL_DATADIR=${G4DATA}
-DGEANT4_BUILD_VERBOSE_CODE=${G4VERBOSE}
......
2021-01-19 Geant4 v106r2p3
===
This release is based on `GEANT4 r10.6.2`, uses `LCG 97a` and `Geant4Files v106r1`.
This version is released on `Sim10` branch.
## Latest Changes
#### General
**Rogue symbols fix in Geant4-srcs
**Minor fixes to CMake
......@@ -23,7 +23,8 @@ if(NOT CMAKE_SOURCE_DIR MATCHES "CMakeTmp")
# - ninja (it requires LD_LIBRARY_PATH set to run)
# - Gaudi (we do not want to use it from LCG)
# - xenv (conflicts with the version in the build environment)
list(FILTER CMAKE_PREFIX_PATH EXCLUDE REGEX "(LCG_|lcg/nightlies).*(ninja|Gaudi|xenv)")
# - git (requires a special environment provided only by LCG views)
list(FILTER CMAKE_PREFIX_PATH EXCLUDE REGEX "(LCG_|lcg/nightlies).*(ninja|Gaudi|xenv|git)/")
endif()
endif()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment