Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DD4hep
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cepc
externals
mirroring
DD4hep
Commits
a4b32bb3
Commit
a4b32bb3
authored
9 years ago
by
Frank Gaede
Browse files
Options
Downloads
Patches
Plain Diff
added version macros and increased version to v00-15
parent
c16863a0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+5
-2
5 additions, 2 deletions
CMakeLists.txt
DDCore/include/DD4hep/LCDD.h
+9
-0
9 additions, 0 deletions
DDCore/include/DD4hep/LCDD.h
DDSegmentation/CMakeLists.txt
+1
-1
1 addition, 1 deletion
DDSegmentation/CMakeLists.txt
doc/release.notes
+8
-0
8 additions, 0 deletions
doc/release.notes
with
23 additions
and
3 deletions
CMakeLists.txt
+
5
−
2
View file @
a4b32bb3
...
...
@@ -26,9 +26,12 @@ option(DD4HEP_USE_CXX11 "Build DD4hep using c++11" OFF)
#-----------------------------------------------------------------------------------------------------
#
# project version (Major,minor,patch)
# Use the same version numbers in DDSegmentaion/CmakeLists.txt
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# !! Use the same version numbers in DDSegmentaion/CmakeLists.txt !!
# !! and make also sure to change in ./DDCore/include/DD4hep/LCDD.h !!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#
dd4hep_set_version
(
DD4hep MAJOR 0 MINOR 1
4
PATCH 0
)
dd4hep_set_version
(
DD4hep MAJOR 0 MINOR 1
5
PATCH 0
)
dd4hep_configure_output
(
OUTPUT
"
${
PROJECT_BINARY_DIR
}
"
INSTALL
"
${
CMAKE_INSTALL_PREFIX
}
"
)
#
#
...
...
This diff is collapsed.
Click to expand it.
DDCore/include/DD4hep/LCDD.h
+
9
−
0
View file @
a4b32bb3
...
...
@@ -14,6 +14,15 @@
#ifndef DD4HEP_LCDD_LCDD_H
#define DD4HEP_LCDD_LCDD_H
// define version macros for DD4hep
#define DD4HEP_MAJOR_VERSION 0
#define DD4HEP_MINOR_VERSION 15
#define DD4HEP_VERSION_GE( MAJV , MINV ) ( ( DD4HEP_MAJOR_VERSION > MAJV ) || ( (DD4HEP_MAJOR_VERSION==MAJV) && ( DD4HEP_MINOR_VERSION >= MINV ) ) )
#define DD4HEP_VERSION_GT( MAJV , MINV ) ( ( DD4HEP_MAJOR_VERSION > MAJV ) || ( (DD4HEP_MAJOR_VERSION==MAJV) && ( DD4HEP_MINOR_VERSION > MINV ) ) )
// Framework includes
#include
"DD4hep/Handle.h"
#include
"DD4hep/Fields.h"
...
...
This diff is collapsed.
Click to expand it.
DDSegmentation/CMakeLists.txt
+
1
−
1
View file @
a4b32bb3
...
...
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
project
(
DDSegmentation
)
#fg: version number must be the same as DD4hep !!
set
(
DDSegmentation_MAJOR_VERSION 0
)
set
(
DDSegmentation_MINOR_VERSION 1
4
)
set
(
DDSegmentation_MINOR_VERSION 1
5
)
set
(
DDSegmentation_PATCH_VERSION 0
)
set
(
DDSegmentation_VERSION
"
${
DDSegmentation_MAJOR_VERSION
}
.
${
DDSegmentation_MINOR_VERSION
}
"
)
set
(
DDSegmentation_SOVERSION
"
${
DDSegmentation_MAJOR_VERSION
}
.
${
DDSegmentation_MINOR_VERSION
}
"
)
...
...
This diff is collapsed.
Click to expand it.
doc/release.notes
+
8
−
0
View file @
a4b32bb3
...
...
@@ -3,6 +3,14 @@
DD4hep ---- Release Notes
=================================
2015-08-27 F.Gaede
- added macros DD4HEP_VERSION_GE(MAJV,MINV) and DD4HEP_VERSION_GT(MAJV,MINV)
to LCDD.h
- increased version number to v00-15
2015-08-20 M.Frank
- DDCore: Modularize/abstract plugin manager
- VolumeManager: Fix bug propagating sensitive detectors
...
...
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