From 74165e291d87f87724d905c790aa7b9c65114afc Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 22 Aug 2024 13:46:14 +0200 Subject: [PATCH 1/2] Find LCIO and substitute Marlin_LIBRARIES for the corresponding libs --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12017f7..18eb680 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,9 @@ INCLUDE( ilcsoft_default_settings ) FIND_PACKAGE( Marlin 1.0 REQUIRED ) # minimum required Marlin version +FIND_PACKAGE( LCIO REQUIRED ) # minimum required Marlin version INCLUDE_DIRECTORIES( SYSTEM ${Marlin_INCLUDE_DIRS} ) -LINK_LIBRARIES( ${Marlin_LIBRARIES} ) +LINK_LIBRARIES( LCIO::lcio Marlin streamlog ) ADD_DEFINITIONS( ${Marlin_DEFINITIONS} ) FIND_PACKAGE( ROOT REQUIRED ) # From c29788d53d25f7dc3a5f4003db17009cc1eb75f5 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Thu, 22 Aug 2024 13:57:51 +0200 Subject: [PATCH 2/2] Remove unrelated comment --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18eb680..1ddffaa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ INCLUDE( ilcsoft_default_settings ) FIND_PACKAGE( Marlin 1.0 REQUIRED ) # minimum required Marlin version -FIND_PACKAGE( LCIO REQUIRED ) # minimum required Marlin version +FIND_PACKAGE( LCIO REQUIRED ) INCLUDE_DIRECTORIES( SYSTEM ${Marlin_INCLUDE_DIRS} ) LINK_LIBRARIES( LCIO::lcio Marlin streamlog ) ADD_DEFINITIONS( ${Marlin_DEFINITIONS} )