From 29ba2b0f05e0e0f246b9df949dffd7705f4553e4 Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 19 Aug 2019 18:55:04 +0200
Subject: [PATCH] DDParsers: boost is mandatory, no need for ifs
---
DDParsers/CMakeLists.txt | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/DDParsers/CMakeLists.txt b/DDParsers/CMakeLists.txt
index 2dbadf735..cca460776 100644
--- a/DDParsers/CMakeLists.txt
+++ b/DDParsers/CMakeLists.txt
@@ -10,17 +10,14 @@
#
#=================================================================================
+dd4hep_print(STATUS "|++> Will build DDParsers")
+
file(GLOB DDParsers_SOURCES src/Parsers/*.cpp src/Evaluator/*.cpp)
-if(Boost_FOUND)
- file(GLOB DDParsers_SPIRIT_SOURCES src/Spirit/*.cpp)
- set(BOOST_LIB Boost::boost)
-endif()
+file(GLOB DDParsers_SPIRIT_SOURCES src/Spirit/*.cpp)
add_library(DDParsers SHARED ${DDParsers_SOURCES} ${DDParsers_SPIRIT_SOURCES})
-target_compile_definitions(DDParsers INTERFACE
- $<$<BOOL:Boost_FOUND>:BOOST_SPIRIT_USE_PHOENIX_V3>
- )
+target_compile_definitions(DDParsers INTERFACE BOOST_SPIRIT_USE_PHOENIX_V3)
target_include_directories(DDParsers
PUBLIC
@@ -28,11 +25,7 @@ target_include_directories(DDParsers
$<INSTALL_INTERFACE:include>
)
-target_link_libraries(DDParsers PUBLIC
- ROOT::Core
- ${BOOST_LIB}
- ${XML_LIBRARIES}
- )
+target_link_libraries(DDParsers PUBLIC ROOT::Core Boost::boost ${XML_LIBRARIES})
set_target_properties(DDParsers PROPERTIES VERSION ${DD4hep_VERSION} SOVERSION ${DD4hep_SOVERSION})
install(TARGETS DDParsers EXPORT DD4hep LIBRARY DESTINATION lib)
--
GitLab