From 1cf1dca05c5d52aa40496ff9d678bd0365e24c20 Mon Sep 17 00:00:00 2001
From: Simon Spannagel <simon.spannagel@cern.ch>
Date: Wed, 11 Dec 2019 16:30:08 +0100
Subject: [PATCH] CMake: update exported targets
---
CMakeLists.txt | 2 --
cmake/corryvreckan.cmake | 8 ++++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8333c20be..9baf6a746 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,8 +106,6 @@ ENDIF()
# Prerequisistes for Corryvreckan #
###################################
-INCLUDE("cmake/corryvreckan.cmake")
-
# Define the libraries
SET(CORRYVRECKAN_LIBRARIES "")
diff --git a/cmake/corryvreckan.cmake b/cmake/corryvreckan.cmake
index bdc0b66c4..17f81a36e 100644
--- a/cmake/corryvreckan.cmake
+++ b/cmake/corryvreckan.cmake
@@ -126,20 +126,20 @@ ENDMACRO()
MACRO(CORRYVRECKAN_SETUP_ROOT_TARGETS)
#ROOT CXX Flags are a string with quotes, not a list, so we need to convert to a list...
- STRING(REPLACE " " ";" ALLXPIX_ROOT_CXX_FLAGS ${ROOT_CXX_FLAGS})
+ STRING(REPLACE " " ";" CORRYVRECKAN_ROOT_CXX_FLAGS ${ROOT_CXX_FLAGS})
IF(NOT TARGET ROOT::Core)
#in ROOT before 6.10 there is no ROOT namespace, so we create ROOT::Core ourselves
ADD_LIBRARY(ROOT::Core INTERFACE IMPORTED GLOBAL)
SET_TARGET_PROPERTIES(ROOT::Core
PROPERTIES
- INTERFACE_COMPILE_OPTIONS "${ALLXPIX_ROOT_CXX_FLAGS}"
+ INTERFACE_COMPILE_OPTIONS "${CORRYVRECKAN_ROOT_CXX_FLAGS}"
INTERFACE_INCLUDE_DIRECTORIES ${ROOT_INCLUDE_DIRS}
)
# there is also no dependency between the targets
TARGET_LINK_LIBRARIES(ROOT::Core INTERFACE Core)
# we list here the targets we use, as later versions of root have the namespace, we do not have to to this for ever
- FOREACH(LIB Geom GenVector Graf3d RIO MathCore Tree Hist)
+ FOREACH(LIB Minuit Minuit2 Gui GenVector Geom Graf3d RIO MathCore Tree Hist GuiBld)
IF(TARGET ${LIB})
ADD_LIBRARY(ROOT::${LIB} INTERFACE IMPORTED GLOBAL)
TARGET_LINK_LIBRARIES(ROOT::${LIB} INTERFACE ${LIB} ROOT::Core)
@@ -149,7 +149,7 @@ MACRO(CORRYVRECKAN_SETUP_ROOT_TARGETS)
# Root 6.12 exports ROOT::Core, but does not assign include directories to the target
SET_TARGET_PROPERTIES(ROOT::Core
PROPERTIES
- INTERFACE_COMPILE_OPTIONS "${ALLXPIX_ROOT_CXX_FLAGS}"
+ INTERFACE_COMPILE_OPTIONS "${CORRYVRECKAN_ROOT_CXX_FLAGS}"
INTERFACE_INCLUDE_DIRECTORIES ${ROOT_INCLUDE_DIRS}
)
ENDIF()
--
GitLab