Update CMakeLists.txt for core/imt

core/imt/CMakeLists.txt

@@ -2,25 +2,44 @@
 # CMakeLists.txt file for building ROOT core/imt package
 ############################################################################
 
-set(headers ROOT/TTaskGroup.hxx)
-set(sources base.cxx TTaskGroup.cxx)
+ROOT_LINKER_LIBRARY(Imt
+    src/base.cxx
+    src/TTaskGroup.cxx
+  DEPENDENCIES
+    Core
+    Thread
+  BUILTINS
+    TBB
+)
 
-if (imt)
-  include_directories(${TBB_INCLUDE_DIRS})
-
-  set(headers ${headers} ROOT/TPoolManager.hxx ROOT/TThreadExecutor.hxx ROOT/TFuture.hxx)
-  set(sources ${sources} TImplicitMT.cxx TThreadExecutor.cxx TPoolManager.cxx G__Imt.cxx)
-  ROOT_GENERATE_DICTIONARY(G__Imt ${headers} STAGE1
-                           MODULE Imt LINKDEF LinkDef.h
-                           DEPENDENCIES Core Thread BUILTINS TBB)
-endif()
+if(imt)
+  target_include_directories(Imt PRIVATE ${TBB_INCLUDE_DIRS})
+  target_link_libraries(Imt PUBLIC ${TBB_LIBRARIES})
 
-ROOT_LINKER_LIBRARY(Imt ${sources}
-                    LIBRARIES ${CMAKE_THREAD_LIBS_INIT} ${TBB_LIBRARIES}
-                    DEPENDENCIES Core Thread BUILTINS TBB)
+  ROOT_GENERATE_DICTIONARY(G__Imt STAGE1
+    ROOT/TFuture.hxx
+    ROOT/TPoolManager.hxx
+    ROOT/TTaskGroup.hxx
+    ROOT/TThreadExecutor.hxx
+    LINKDEF
+      LinkDef.h
+    MODULE
+      Imt
+    DEPENDENCIES
+      Core
+      Thread
+    BUILTINS
+      TBB
+  )
 
-ROOT_INSTALL_HEADERS(${installoptions})
+  target_sources(Imt PRIVATE
+    G__Imt.cxx
+    src/TImplicitMT.cxx
+    src/TPoolManager.cxx
+    src/TThreadExecutor.cxx
+  )
 
-if(imt)
-    ROOT_ADD_TEST_SUBDIRECTORY(test)
+  ROOT_ADD_TEST_SUBDIRECTORY(test)
 endif()
+
+ROOT_INSTALL_HEADERS()