Skip to content
Snippets Groups Projects
Commit e233aa9b authored by liblhcb's avatar liblhcb
Browse files

updates and fixes to CMake build

- added build of examples
- use Geant4 sources from git (https://gitlab.cern.ch/lhcb/Geant4-srcs)

Merge branch 'master' of ssh://gitlab.cern.ch:7999/clemenci/Geant4

* 'master' of ssh://gitlab.cern.ch:7999/clemenci/Geant4:
  added entries to release.notes
  minor fix to handling of G4_NATIVE_VERSION
  use Geant4-srcs master for version HEAD
  do not use Ninja to buid Geant4 (not working)
  Get Geant4 sources from git instead of tarfiles
  fixed installation of Geant4 analysis headers
  install examples scripts and create "aliases" for commands
  removed 'Makefile's that should not be there
  Fixed build of the selected examples.
  updated copying of Geant4 sources to CMT directories
  added useful .gitignore files

See merge request !1


git-svn-id: svn+ssh://svn.cern.ch/reps/lhcb/Geant4/trunk@197133 4525493e-7705-40b1-a816-d608a930855b
parents d7d6ff1e d515758d
No related branches found
No related tags found
No related merge requests found
Showing
with 75 additions and 30 deletions
/Makefile
/.cproject
/.project
/.settings/
/InstallArea/
/build.*/
/.pydevproject
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
set(Geant4_version 4.9.6.p04)
if(DEFINED ENV{G4_NATIVE_VERSION})
# Override the version of Geant4 from the variable
set(Geant4_version $ENV{G4_NATIVE_VERSION})
if(NOT Geant4_version 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_version 4.${Geant4_version})
endif()
endif()
# NO_NINJA : Geant4 build fails with Ninja
find_package(GaudiProject)
gaudi_project(Geant4 v96r4p3
......
/FukuiRenderer/
/G4FR/
......@@ -4,6 +4,9 @@
! Purpose : Build of Fukui Renderer
!-----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
!========================== G4FR v4r4 2011-04-12 =============================
! 2011-04-12 - Gloria Corti
- Introduce use of pattern to switch off building this package on winxp
......@@ -14,7 +17,7 @@
!========================== G4FR v4r2 2008-09-30 =============================
! 2008-09-30 - Gloria CORTI
- requirements - Take DAWN and DAVID from the $LCG_external area (latest
- requirements - Take DAWN and DAVID from the $LCG_external area (latest
versions) rather then obsolete $SITEROOT/sw/contrib
!========================== G4FR v4r1 2004-08-10 ========================
......
/G4GDML/
/schema/
/src/
!-----------------------------------------------------------------------------
! Package : Geant4/G4GDML
! Responsible :
! Responsible :
! Purpose : Package holding the GDML code
!-----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
! ======================= G4GDML v2r0 2015-03-06 ========================
! 2015-03-06 - Nigel Watsoncic
......
......@@ -4,15 +4,18 @@
! Purpose : Private LHCb physics lists
!----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
!======================== G4LHCblists v3r2 2015-04-30 ========================
! 2015-04-30 - Timothy Williams
- Replaced G4EmStandardPhysics_option1NoApplyCuts.cc and .hh with v9.6.p04
of G4EmStandardPhysics_option1.cc and .hh but with the EmProcessOption of "SetApplyCuts"
removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetApplyCuts" removed.
- Replaced G4EmStandardPhysics_option1NoApplyCuts.cc and .hh with v9.6.p04
of G4EmStandardPhysics_option1.cc and .hh but with the EmProcessOption of "SetApplyCuts"
removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetApplyCuts" removed.
!======================== G4LHCblists v3r1 2015-03-07 ========================
! 2015-03-07 - Timothy Williams
- Modified G4EmStandardPhysics_option1NoApplyCuts.cc to use UrbanMsc93 and
- Modified G4EmStandardPhysics_option1NoApplyCuts.cc to use UrbanMsc93 and
WentzelVI models for multiple scattering as suggested by V.Ivanchenko.
!======================== G4LHCblists v3r0 2013-09-16 ========================
......@@ -22,7 +25,7 @@ removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetA
!======================== G4LHCblists v2r2 2011-10-03 ========================
! 2011-10-03 - Gloria Corti
- Add new list with suggestion from Matt Reid for improvement of Multiple
- Add new list with suggestion from Matt Reid for improvement of Multiple
scattering. It has the same options as the LHCb list.
. G4EmStandardPhysics_LHCbTest.{hh,cc}
......@@ -35,7 +38,7 @@ removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetA
!======================== G4LHCblists v2r0 2011-07-13 ========================
! 2011-07-13 - Gloria Corti
- Fix renaming in G4EmStandardPhysics_option1NoApplyCuts.cc
- Fix renaming in G4EmStandardPhysics_option1NoApplyCuts.cc
! 2011-07-12 - Gloria Corti
- Remove old physics list, that are obsolete.
......@@ -51,4 +54,4 @@ removed. Previous version was v9.4 of G4EmStandardPhysics_option1.cc with "SetA
- New package to hold private LHCb physics lists. It has the QGSP_BERT_HP
list provided by H-P Wellish for low energy neutron studies
!=============================================================================
\ No newline at end of file
!=============================================================================
/G4OpenGL/
/OpenGL/
!-----------------------------------------------------------------------------
! Package : Geant4/G4OpenGL
! Responsible : Gloria CORTI
! Purpose :
! Purpose :
!-----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
!======================== G4OpenGL v4r4 2011-06-17 ===========================
! 2011-06-17 - Gloria Corti
- Use new G4external package needed for resolving class G4OpenGL2PSAction at
......
/G4RayTracer/
/RayTracer/
!-----------------------------------------------------------------------------
! Package : Geant4/G4RayTracer
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
! Purpose :
! Purpose :
!-----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
!======================== G4RayTRacer v5r1 2011-07-14 ========================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
......
/G4Tree/
/Tree/
!-----------------------------------------------------------------------------
! Package : Geant4/G4Tree
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
! Purpose :
! Purpose :
!-----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
!========================== G4Tree v4r1p1 2011-07-14 =========================
! 2011-03-02 - Hubert Degaudenzi
- Added ignore properties in svn
......
/G4UIGAG/
/GAG/
!-----------------------------------------------------------------------------
! Package : Geant4/G4UIGAG
! Responsible : Gloria CORTI
! Purpose :
! Purpose :
!-----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
!========================== G4UIGAG v4r3 2015-03-02 ==========================
! 20154-03-06 - Nigel Watson
- For release with 9.6 G4
......
/basic/
/G4UIbasic/
!-----------------------------------------------------------------------------
! Package : Geant4/G4UIbasic
! Responsible : Gloria CORTI, Silvia MIGLIORANZI
! Purpose :
! Purpose :
!-----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
!========================== G4UIbasic v4r4 2015-03-06 ========================
! 2015-03-06 - Nigel Watson
- tagged for release with G4 9.6
......@@ -19,7 +23,7 @@
!========================== G4UIbasic v4r1 2008-06-25 ========================
! 2008-06-17 - Gloria CORTI
- Add use of G4run required to solve undefined reference to
- Add use of G4run required to solve undefined reference to
`G4RunManager::GetRunManager()' with Geant4 v90r2 (9.0.p02)
!========================== G4UIbasic v4r0 2003-11-03 ========================
......
/common/
/G4UIcommon/
!-----------------------------------------------------------------------------
! Package : Geant4/G4UIcommon
! Responsible : Gloria CORTI
! Purpose :
! Purpose :
!-----------------------------------------------------------------------------
! 2015-11-02 - Marco Clemencic
- Added .gitignore file
!======================== G4UIcommon v5r3 2011-04-12 =========================
! 2011-04-12 - Gloria Corti
- Introduce use of pattern to switch off building this package on MacOS
......@@ -14,12 +17,12 @@
!======================== G4UIcommon v5r1 2007-07-04 =========================
! 2007-07-04 - Gloria Corti
- requirements - redefine X_linkopts for amd64
- requirements - redefine X_linkopts for amd64
!=========================== G4UIcommon v5r0 =================================
! 2004-07-07 - Florence RANJARD
- requirements - on WIN32 append "gdi32.lib user32.lib" to
G4UIcommon_shlibflags
- requirements - on WIN32 append "gdi32.lib user32.lib" to
G4UIcommon_shlibflags
!========================== G4UIcommon v4r0 2003-11-03 ========================
! 2003-11-03 - Florence RANJARD
......
/G4VRML/
/VRML/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment