From fbe63a4371fd44e21d56b2dbe819039009bfc8b4 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Thu, 30 Jan 2014 13:50:39 +0000
Subject: [PATCH] Fix bug, which appears with earlier versions than root
5.34.10
---
cmake/Doxyfile.in | 7 ++++---
cmake/FindROOT.cmake | 6 ++++++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/cmake/Doxyfile.in b/cmake/Doxyfile.in
index 8621ef090..5f8cff338 100644
--- a/cmake/Doxyfile.in
+++ b/cmake/Doxyfile.in
@@ -649,12 +649,14 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = @CMAKE_CURRENT_SOURCE_DIR@/DDCore/src
+INPUT = @CMAKE_CURRENT_SOURCE_DIR@/DDCore/src
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDCore/src/XML
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDCore/include/DD4hep
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDCore/include/XML
-INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/src
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/include/DDG4
+INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/src
+INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/plugins
+INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDG4/lcio
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSegmentation/src
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSegmentation/include/DDSegmentation
INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSense/src
@@ -662,7 +664,6 @@ INPUT += @CMAKE_CURRENT_SOURCE_DIR@/DDSense/include/DDSense
#INPUT += @CMAKE_CURRENT_SOURCE_DIR@//src
#INPUT += @CMAKE_CURRENT_SOURCE_DIR@//include
-
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
# also the default input encoding. Doxygen uses libiconv (or the iconv built
diff --git a/cmake/FindROOT.cmake b/cmake/FindROOT.cmake
index 818f9cf21..0711e1ba4 100644
--- a/cmake/FindROOT.cmake
+++ b/cmake/FindROOT.cmake
@@ -32,6 +32,11 @@ if(ROOT_CONFIG_EXECUTABLE)
OUTPUT_VARIABLE ROOT_LIBRARIES
OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(
+ COMMAND ${ROOT_CONFIG_EXECUTABLE} --evelibs
+ OUTPUT_VARIABLE ROOT_EVE_LIBRARIES
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
set(ROOT_LIBRARY_DIR ${ROOTSYS}/lib)
set(ROOT_ROOT ${ROOTSYS})
@@ -42,6 +47,7 @@ if(ROOT_CONFIG_EXECUTABLE)
endif()
set(ROOT_LIBRARIES ${ROOT_LIBRARIES} -lGenVector)
+set(ROOT_EVE_LIBRARIES ${ROOT_EVE_LIBRARIES} )
# handle the QUIETLY and REQUIRED arguments and set ROOT_FOUND to TRUE if
# all listed variables are TRUE
--
GitLab