From fdfeabb37ade0c33d9b9ced33ad53226a6398468 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Sun, 12 Jul 2015 01:14:05 +0000
Subject: [PATCH] Bug fix for compatibility mode
---
DDRec/CMakeLists.txt | 2 +-
cmake/DD4hep.cmake | 4 ++++
examples/AlignDet/CMakeLists.txt | 4 ++--
examples/CLICSiD/CMakeLists.txt | 4 ++--
examples/ClientTests/CMakeLists.txt | 2 +-
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/DDRec/CMakeLists.txt b/DDRec/CMakeLists.txt
index 7b15d4b37..c6c1825d4 100644
--- a/DDRec/CMakeLists.txt
+++ b/DDRec/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include
file(GLOB sources src/*.cpp)
file(GLOB plugin_sources src/plugins/*.cpp)
-set(rec_link_libraries DDCore ${DDSegmentation_LIBRARIES} ${ROOT_LIBRARIES} Geom Reflex)
+set(rec_link_libraries DDCore ${DDSegmentation_LIBRARIES} ${ROOT_LIBRARIES} Geom)
#--------------------------- GEAR wrappers for backward compatibility -----------
if(DD4HEP_USE_GEAR)
diff --git a/cmake/DD4hep.cmake b/cmake/DD4hep.cmake
index a69ba7e48..9160c6271 100644
--- a/cmake/DD4hep.cmake
+++ b/cmake/DD4hep.cmake
@@ -74,7 +74,11 @@ function(dd4hep_generate_rootmap_notapple library)
endif()
find_package(ROOT QUIET)
+if(DD4HEP_NO_REFLEX)
+ set(rootmapfile ${CMAKE_SHARED_MODULE_PREFIX}${library}.components)
+else()
set(rootmapfile ${CMAKE_SHARED_MODULE_PREFIX}${library}.rootmap)
+endif()
set(libname ${CMAKE_SHARED_MODULE_PREFIX}${library}${CMAKE_SHARED_LIBRARY_SUFFIX})
diff --git a/examples/AlignDet/CMakeLists.txt b/examples/AlignDet/CMakeLists.txt
index 9518ff0a7..4bc593eaa 100644
--- a/examples/AlignDet/CMakeLists.txt
+++ b/examples/AlignDet/CMakeLists.txt
@@ -35,8 +35,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DD4hep_ROOT}/cmake )
include( DD4hep )
#find_package( ROOT REQUIRED )
-find_package( ROOT REQUIRED COMPONENTS Geom Reflex)
-set( ROOT_COMPONENT_LIBRARIES Geom Reflex)
+find_package( ROOT REQUIRED COMPONENTS Geom)
+set( ROOT_COMPONENT_LIBRARIES Geom)
#-------------------------------------------------------------
# add additional packages here
diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt
index f88226856..ec1eb2eee 100644
--- a/examples/CLICSiD/CMakeLists.txt
+++ b/examples/CLICSiD/CMakeLists.txt
@@ -35,8 +35,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DD4hep_ROOT}/cmake )
include( DD4hep )
#find_package( ROOT REQUIRED )
-find_package( ROOT REQUIRED COMPONENTS Geom Reflex)
-set( ROOT_COMPONENT_LIBRARIES Geom Reflex)
+find_package( ROOT REQUIRED COMPONENTS Geom)
+set( ROOT_COMPONENT_LIBRARIES Geom)
#-------------------------------------------------------------
# add additional packages here
diff --git a/examples/ClientTests/CMakeLists.txt b/examples/ClientTests/CMakeLists.txt
index 2d175daec..737c000b3 100644
--- a/examples/ClientTests/CMakeLists.txt
+++ b/examples/ClientTests/CMakeLists.txt
@@ -31,7 +31,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DD4hep_ROOT}/cmake )
include( DD4hep )
find_package( ROOT REQUIRED )
-set( ROOT_COMPONENT_LIBRARIES Geom Reflex)
+set( ROOT_COMPONENT_LIBRARIES Geom)
#-------------------------------------------------------------
# add additional packages here
#-------------------------------------------------------------
--
GitLab