From a4b32bb36b9ea34b3363b8c943b6ef83aa84e871 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Thu, 27 Aug 2015 14:58:05 +0000
Subject: [PATCH] added version macros and increased version to v00-15
---
CMakeLists.txt | 7 +++++--
DDCore/include/DD4hep/LCDD.h | 9 +++++++++
DDSegmentation/CMakeLists.txt | 2 +-
doc/release.notes | 8 ++++++++
4 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12c232edb..6d3b529a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 14 PATCH 0)
+dd4hep_set_version(DD4hep MAJOR 0 MINOR 15 PATCH 0)
dd4hep_configure_output( OUTPUT "${PROJECT_BINARY_DIR}" INSTALL "${CMAKE_INSTALL_PREFIX}" )
#
#
diff --git a/DDCore/include/DD4hep/LCDD.h b/DDCore/include/DD4hep/LCDD.h
index e9ff07191..0c8978647 100644
--- a/DDCore/include/DD4hep/LCDD.h
+++ b/DDCore/include/DD4hep/LCDD.h
@@ -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"
diff --git a/DDSegmentation/CMakeLists.txt b/DDSegmentation/CMakeLists.txt
index 70e5363cc..073426f5a 100644
--- a/DDSegmentation/CMakeLists.txt
+++ b/DDSegmentation/CMakeLists.txt
@@ -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 14)
+set(DDSegmentation_MINOR_VERSION 15)
set(DDSegmentation_PATCH_VERSION 0)
set(DDSegmentation_VERSION "${DDSegmentation_MAJOR_VERSION}.${DDSegmentation_MINOR_VERSION}" )
set(DDSegmentation_SOVERSION "${DDSegmentation_MAJOR_VERSION}.${DDSegmentation_MINOR_VERSION}")
diff --git a/doc/release.notes b/doc/release.notes
index a8f639f05..fb36c28c6 100644
--- a/doc/release.notes
+++ b/doc/release.notes
@@ -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
--
GitLab