diff --git a/algo/data/CMakeLists.txt b/algo/data/CMakeLists.txt
index 817de8ab132beb534e263408a7e90dba7cd7fdff..0fd4f3a931d02d9e079cbf78302af3751074336d 100644
--- a/algo/data/CMakeLists.txt
+++ b/algo/data/CMakeLists.txt
@@ -2,25 +2,19 @@
 # the array .
 # The extension is already found.  Any number of sources could be listed here.
 
-set(INCLUDE_DIRECTORIES
-   ${CMAKE_SOURCE_DIR}/core/data
-   ${CMAKE_SOURCE_DIR}/core/data/sts
+set(SRCS
+  ${CMAKE_SOURCE_DIR}/core/data/sts/CbmStsDigi.cxx
 )
 
-include_directories(${INCLUDE_DIRECTORIES})
+add_library(OnlineData SHARED ${SRCS})
 
-set(SYSTEM_INCLUDE_DIRECTORIES
-  ${Boost_INCLUDE_DIR}
+target_include_directories(OnlineData
+  PUBLIC ${CMAKE_SOURCE_DIR}/core/data
+  PUBLIC ${CMAKE_SOURCE_DIR}/core/data/sts
 )
 
-include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
-
-set(SRCS
-  ${CMAKE_SOURCE_DIR}/core/data/sts/CbmStsDigi.cxx
+target_include_directories(OnlineData SYSTEM
+  PUBLIC ${Boost_INCLUDE_DIR}
 )
 
-
-ADD_DEFINITIONS(-DNO_ROOT)
-
-#---Create a shared library with geneated dictionary
-add_library(OnlineData SHARED ${SRCS})
+target_compile_definitions(OnlineData PUBLIC NO_ROOT)