diff --git a/DDDigi/CMakeLists.txt b/DDDigi/CMakeLists.txt
index cd08285bd90bfea4bcf509f8a54d527d6fa15b3d..c597d69cb316a2c0b1c189971e2e6b7bba3e3661 100644
--- a/DDDigi/CMakeLists.txt
+++ b/DDDigi/CMakeLists.txt
@@ -11,16 +11,18 @@
 dd4hep_package(    DDDigi
   USES             DDCore
                    [ROOT   REQUIRED COMPONENTS Geom GenVector RIO]
-		   TBB
   INCLUDE_DIRS     include
   INSTALL_INCLUDES include/DDDigi )
 
 #---Add Library---------------------------------------------------------------------
-dd4hep_add_package_library(DDDigi SOURCES src/*.cpp)
+dd4hep_add_package_library(DDDigi SOURCES src/*.cpp
+  [OPTIONAL TBB REQUIRED]
+  )
 if( TBB_INCLUDE_DIR )
-  message( STATUS "TBB_INCLUDE_DIR : ${TBB_INCLUDE_DIR}")
-  message( STATUS "TBB_LIBRARY : ${TBB_LIBRARY}")
+  message( STATUS "TBB_INCLUDE_DIR -->  ${TBB_INCLUDE_DIR}")
+  message( STATUS "TBB_LIBRARY     -->  ${TBB_LIBRARY}")
   target_compile_definitions(DDDigi PUBLIC DD4HEP_USE_TBB)
+  target_link_libraries(DDDigi ${TBB_LIBRARY})
 endif()
 
 #---------------------------  Legacy libraries -------------------------------------