Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Geant4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LHCb
Geant4
Commits
d6eac53f
Commit
d6eac53f
authored
6 years ago
by
Dmitry Popov
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Merge branch 'v105r0-release' into 'Sim10'"
This reverts merge request
!41
parent
89d93621
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
Geant4/G4config/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Geant4/G4config/CMakeLists.txt
ReleaseNotes/v105r0.md
+0
-5
0 additions, 5 deletions
ReleaseNotes/v105r0.md
with
3 additions
and
8 deletions
CMakeLists.txt
+
2
−
2
View file @
d6eac53f
...
@@ -5,8 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
...
@@ -5,8 +5,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
set
(
GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING
"Repository for Geant4 sources"
)
set
(
GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING
"Repository for Geant4 sources"
)
find_package
(
GaudiProject
)
find_package
(
GaudiProject
)
gaudi_project
(
Geant4 v10
5r0
gaudi_project
(
Geant4 v10
4r2p1
DATA Geant4Files VERSION v10
5r0
)
DATA Geant4Files VERSION v10
4r1
)
# FIXME: hack for compatibility with CMT build
# FIXME: hack for compatibility with CMT build
file
(
WRITE
${
CMAKE_BINARY_DIR
}
/dummy.cpp
""
)
file
(
WRITE
${
CMAKE_BINARY_DIR
}
/dummy.cpp
""
)
...
...
This diff is collapsed.
Click to expand it.
Geant4/G4config/CMakeLists.txt
+
1
−
1
View file @
d6eac53f
...
@@ -30,7 +30,7 @@ if (NOT GEANT4_TAG)
...
@@ -30,7 +30,7 @@ if (NOT GEANT4_TAG)
elseif
(
CMAKE_PROJECT_VERSION STREQUAL
"HEAD"
)
elseif
(
CMAKE_PROJECT_VERSION STREQUAL
"HEAD"
)
# Special mapping of version HEAD
# Special mapping of version HEAD
# WARNING this must be kept up to date manually
# WARNING this must be kept up to date manually
set
(
GEANT4_TAG
"lhcb/v10.
5.0
-branch"
)
set
(
GEANT4_TAG
"lhcb/v10.
4.2
-branch"
)
else
()
else
()
set
(
GEANT4_TAG lhcb/
${
CMAKE_PROJECT_VERSION
}
)
set
(
GEANT4_TAG lhcb/
${
CMAKE_PROJECT_VERSION
}
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
ReleaseNotes/v105r0.md
deleted
100644 → 0
+
0
−
5
View file @
89d93621
2019-01-10 Geant4 v105r0
===
This release is based on
`GEANT4 r10.5.0`
, uses
`LCG 93`
and
`Geant4Files v105r0`
.
This version is released on
`Sim10`
branch.
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment