compatibility fixes for podiov00-10

HEP-FCC · May 4, 2020 · 8d26ba1 · 8d26ba1
1 parent d43eb65
commit 8d26ba1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,13 +23,6 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 find_package(podio REQUIRED HINTS $ENV{PODIO})
-# Make sure the library is found.
-# Not the case if LD_LIBRARY_PATH is wrong
-find_library(PODIOLIB podio PATHS ${podio_DIR}/../lib)
-if (NOT PODIOLIB)
-    message(FATAL_ERROR "libpodio.so(dylib) cannot be found dynamically. Make sure you have set up your environment to use PODIO")
-endif()
-link_directories(${podio_LIBRARY_DIR})
 
 execute_process(COMMAND python ${podio_DIR}/../../../python/podio_class_generator.py edm.yaml datamodel datamodel
                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
@@ -69,10 +62,11 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DDROP_CGAL ${CPP_STANDARD_FLAGS}
 #--- Declare ROOT dependency ---------------------------------------------------
 list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-find_package(ROOT REQUIRED COMPONENTS RIO Tree Physics) # TODO: Add  ROOTDataFrame ROOTVecOps as ROOT 6.16 available
-include_directories(${ROOT_INCLUDE_DIR})
+find_package(ROOT REQUIRED COMPONENTS RIO Tree Physics)
+set(ROOT_genreflex_cmd ${ROOT_genreflex_CMD})
 include(${ROOT_USE_FILE})
 
+
 find_package(dag REQUIRED HINTS $ENV{FCCDAG})
 if(${DAG_FOUND})
   message(STATUS "Found dag: ${DAG_DIR}")

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -11,11 +11,11 @@ add_executable(fccedm-simplewrite simplewrite.cc)
 add_executable(fccedm-simpleread simpleread.cc)
 add_executable(fccedm-graph graph.cc)
 
-target_link_libraries(fccedm-write utilities datamodel podio datamodelDict)
-#target_link_libraries(fccedm-dataframe utilities datamodel podio datamodelDict ROOT::ROOTDataFrame)
-target_link_libraries(fccedm-read utilities datamodel podio datamodelDict )
-target_link_libraries(fccedm-simplewrite utilities datamodel podio datamodelDict )
-target_link_libraries(fccedm-simpleread utilities datamodel podio datamodelDict )
+target_link_libraries(fccedm-write utilities datamodel podio::podioRootIO datamodelDict)
+#target_link_libraries(fccedm-dataframe utilities datamodel podio::podioRootIO datamodelDict ROOT::ROOTDataFrame)
+target_link_libraries(fccedm-read utilities datamodel podio::podioRootIO datamodelDict )
+target_link_libraries(fccedm-simplewrite utilities datamodel podio::podioRootIO datamodelDict )
+target_link_libraries(fccedm-simpleread utilities datamodel podio::podioRootIO datamodelDict )
 target_link_libraries(fccedm-graph utilities)
 install(TARGETS fccedm-write fccedm-read fccedm-simplewrite fccedm-simpleread #fccedm-dataframe
   # IMPORTANT: Add the write executable to the "export-set"

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -5,8 +5,8 @@ include_directories(
 add_executable(fccedm-graph-write graph_write_test.cc)
 add_executable(fccedm-graph-read graph_read_test.cc)
 
-target_link_libraries(fccedm-graph-read utilities datamodel podio datamodelDict)
-target_link_libraries(fccedm-graph-write utilities datamodel podio datamodelDict )
+target_link_libraries(fccedm-graph-read utilities datamodel podio::podioRootIO datamodelDict)
+target_link_libraries(fccedm-graph-write utilities datamodel podio::podioRootIO datamodelDict )
 
 
 # --- adding tests for examples ------------------------------

diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(${CMAKE_SOURCE_DIR}/utilities)
 ROOT_GENERATE_DICTIONARY(G__utilities FCCLambdas.h LINKDEF LinkDef.h)
 
 add_library(utilities SHARED ${sources} ${headers} G__utilities.cxx )
-target_link_libraries(utilities datamodel podio ROOT::Physics)
+target_link_libraries(utilities datamodel podio::podioRootIO ROOT::Physics)
 
 set_target_properties(utilities PROPERTIES
   PUBLIC_HEADER "${headers}")