From c7c91408b2f69d8099cc88af376dcd2477b49bf6 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 14 Oct 2019 11:29:15 +0200
Subject: [PATCH] CMake: fix use of DD4hep namespace, not CMAKE_PROJECT_NAME
when building stand alone DD packages
---
CMakeLists.txt | 5 +++--
cmake/DD4hepConfig.cmake.in | 8 ++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad3f2e766..49db2de8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,14 +164,15 @@ IF(DD4HEP_USE_EXISTING_DD4HEP)
dd4hep_print("|> Building ${DDPackage}")
add_subdirectory(${DDPackage})
ENDFOREACH()
-
-
+ LIST(GET DD4HEP_BUILD_PACKAGES 0 DD4HEP_SELECTED_PACKAGE)
ELSE()
include(DD4hep_XML_setup)
#These pacakges are mandatory
+SET(DD4HEP_SELECTED_PACKAGE DDCore)
FOREACH(DDPackage GaudiPluginService DDParsers DDCore)
+ dd4hep_print("|> Building ${DDPackage}")
add_subdirectory(${DDPackage})
ENDFOREACH()
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 72abed33c..ef997b8a8 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -73,18 +73,18 @@ if(NOT CMAKE_PROJECT_NAME STREQUAL @CMAKE_PROJECT_NAME@)
endif()
# Backward compatible @CMAKE_PROJECT_NAME@_INCLUDE_DIRS and @CMAKE_PROJECT_NAME@_LIBRARIES variables
-GET_TARGET_PROPERTY(@CMAKE_PROJECT_NAME@_INCLUDE_DIRS @CMAKE_PROJECT_NAME@::DDCore INTERFACE_INCLUDE_DIRECTORIES)
-set(@CMAKE_PROJECT_NAME@_LIBRARIES @CMAKE_PROJECT_NAME@::DDCore)
+GET_TARGET_PROPERTY(@CMAKE_PROJECT_NAME@_INCLUDE_DIRS DD4hep::@DD4HEP_SELECTED_PACKAGE@ INTERFACE_INCLUDE_DIRECTORIES)
+set(@CMAKE_PROJECT_NAME@_LIBRARIES DD4hep::@DD4HEP_SELECTED_PACKAGE@)
# Backward compatible @CMAKE_PROJECT_NAME@_COMPONENT_LIBRARIES variable
SET(@CMAKE_PROJECT_NAME@_COMPONENT_LIBRARIES)
IF(@CMAKE_PROJECT_NAME@_FIND_COMPONENTS)
dd4hep_print( "|++> @CMAKE_PROJECT_NAME@: Looking for Components: ${@CMAKE_PROJECT_NAME@_FIND_COMPONENTS}" )
FOREACH(comp ${@CMAKE_PROJECT_NAME@_FIND_COMPONENTS})
- IF(NOT TARGET @CMAKE_PROJECT_NAME@::${comp})
+ IF(NOT TARGET DD4hep::${comp})
MESSAGE(FATAL_ERROR "|++> Did not find required component: ${comp}")
ENDIF()
- LIST(APPEND @CMAKE_PROJECT_NAME@_COMPONENT_LIBRARIES @CMAKE_PROJECT_NAME@::${comp})
+ LIST(APPEND @CMAKE_PROJECT_NAME@_COMPONENT_LIBRARIES DD4hep::${comp})
ENDFOREACH()
ENDIF()
--
GitLab