diff --git a/CMakeLists.txt b/CMakeLists.txt
index e13b2a9167c488611fc68a53307c55ae9bc8e692..87fbc0381b374bd2751a09d7ebd275a043d8ee78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,6 +102,11 @@ SET_TARGET_PROPERTIES(Boost::boost
   INTERFACE_COMPILE_DEFINITIONS BOOST_SPIRIT_USE_PHOENIX_V3
   )
 
+IF(DD4HEP_USE_LCIO)
+  FIND_PACKAGE(LCIO REQUIRED)
+  DD4HEP_SETUP_LCIO_TARGETS()
+ENDIF()
+
 ######################
 # Set compiler flags #
 ######################
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index 56ed3b896044d1907d3aae882b83832823f404c6..47a683c9c600e47a8d24dd44c93c0a3e41d55f48 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -98,10 +98,9 @@ endif()
 #---------------------------  Plugin library for the simulation framework  ---------
 #---------------------------  LCIO Plugins for new simulation framework  -----------
 IF(DD4HEP_USE_LCIO)
-  FIND_PACKAGE(LCIO REQUIRED)    
   new_dd4hep_add_plugin(DDG4LCIO
     SOURCES lcio/*.cpp
-    LINK_LIBRARIES ${LCIO_LIBRARIES}
+    LINK_LIBRARIES LCIO::LCIO
     )
 ENDIF()
 # #---------------------------  DDRec dependent Plugins  -----------------------------
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 4a694277b269c04be32a5c4cc08793331eb600df..e4a1c2a6df28e0cf34fc7e40940eea1f995eebfe 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -1762,4 +1762,13 @@ MACRO(DD4HEP_SETUP_GEANT4_TARGETS)
     MESSAGE(STATUS "Geant4_VERSION: ${Geant4_VERSION}" )
 
   ENDIF()
-ENDMACRO()
\ No newline at end of file
+ENDMACRO()
+
+MACRO(DD4HEP_SETUP_LCIO_TARGETS)
+
+  IF(NOT TARGET LCIO::LCIO)
+    ADD_LIBRARY(LCIO::LCIO INTERFACE GLOBAL)
+    TARGET_LINK_LIBRARIES(LCIO::LCIO ${LCIO_LIBRARIES})
+    TARGET_INLCUDE_DIRECTORIES(LCIO::LCIO INTERFACE ${LCIO_INCLUDE_DIRS})
+  ENDIF()
+ENDMACRO()