[core] Add core headers to private CMake target FILE_SETS

builtins/libtextinput/CMakeLists.txt

@@ -26,10 +26,31 @@ target_sources(textinput PRIVATE
   TextInputContext.cpp
   TextInput.cpp
   UTF8.cpp
-)
-
-target_include_directories(textinput
   PUBLIC
-    ./ # to be able to call #include "textinput/header.h" from ROOT core files
+  FILE_SET HEADERS
+  TYPE HEADERS
+  BASE_DIRS ./ # to be able to call #include "textinput/header.h" from ROOT core files
+  FILES
+    textinput/Callbacks.h
+    textinput/Color.h
+    textinput/Display.h
+    textinput/Editor.h
+    textinput/History.h
+    textinput/InputData.h
+    textinput/KeyBinding.h
+    textinput/Range.h
+    textinput/Reader.h
+    textinput/SignalHandler.h
+    textinput/StreamReader.h
+    textinput/StreamReaderUnix.h
+    textinput/StreamReaderWin.h
+    textinput/TerminalConfigUnix.h
+    textinput/TerminalDisplay.h
+    textinput/TerminalDisplayUnix.h
+    textinput/TerminalDisplayWin.h
+    textinput/Text.h
+    textinput/TextInputContext.h
+    textinput/TextInput.h
 )
+
 set_property(TARGET textinput PROPERTY POSITION_INDEPENDENT_CODE ON)

core/base/CMakeLists.txt

@@ -198,23 +198,23 @@ set(BASE_SOURCES
   src/TVirtualX.cxx
 )
 
-set(RELATIVE_BASE_INC_HEADERS ${BASE_HEADERS})
-list(TRANSFORM RELATIVE_BASE_INC_HEADERS PREPEND inc/)
+set(RELATIVE_INC_HEADERS ${BASE_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
 
 # only here complete list of headers can be propogated to parent cmake file
 set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ${BASE_HEADERS})
 
-target_sources(Core PRIVATE ${BASE_SOURCES})
-
-target_sources(
-    Core
-    PRIVATE
-    FILE_SET private_header_files
-    TYPE HEADERS
-    BASE_DIRS inc/ src/
-    FILES
-        ${RELATIVE_BASE_INC_HEADERS}
-        src/TListOfTypes.h
+target_sources(Core
+PRIVATE
+  ${BASE_SOURCES}
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/ src/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+    src/TListOfTypes.h
 )
 
 target_include_directories(Core PUBLIC

core/clingutils/CMakeLists.txt

@@ -25,6 +25,19 @@ ROOT_OBJECT_LIBRARY(ClingUtils
   src/TClingUtils.cxx
 )
 
+set(RELATIVE_RES_HEADERS RStl.h TClingUtils.h)
+list(TRANSFORM RELATIVE_RES_HEADERS PREPEND res/)
+
+target_sources(ClingUtils
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS res/ inc/
+  FILES
+    ${RELATIVE_RES_HEADERS}
+    inc/root_std_complex.h
+)
+
 if(NOT MSVC)
   target_compile_options(ClingUtils PRIVATE -Wno-error)
 endif()

core/cont/CMakeLists.txt

@@ -7,8 +7,7 @@
 ############################################################################
 # CMakeLists.txt file for building ROOT core/cont package
 ############################################################################
-
-set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
+set(CONT_HEADERS
   ROOT/TSeq.hxx
   TArrayC.h
   TArrayD.h
@@ -40,7 +39,13 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
   TVirtualCollectionProxy.h
 )
 
-target_sources(Core PRIVATE
+set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ${CONT_HEADERS})
+
+set(RELATIVE_INC_HEADERS ${CONT_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
+target_sources(Core
+PRIVATE
   src/TArrayC.cxx
   src/TArray.cxx
   src/TArrayD.cxx
@@ -67,6 +72,12 @@ target_sources(Core PRIVATE
   src/TRefTable.cxx
   src/TSeqCollection.cxx
   src/TSortedList.cxx
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
 )
 
 target_include_directories(Core

core/dictgen/CMakeLists.txt

@@ -27,6 +27,32 @@ ROOT_OBJECT_LIBRARY(Dictgen
   XMLReader.cxx
 )
 
+set(DICTGEN_HEADERS
+  BaseSelectionRule.h
+  ClassSelectionRule.h
+  cygpath.h
+  DictSelectionReader.h
+  LinkdefReader.h
+  rootcling_impl.h
+  Scanner.h
+  SelectionRules.h
+  TModuleGenerator.h
+  VariableSelectionRule.h
+  XMLReader.h
+)
+
+set(RELATIVE_RES_HEADERS ${DICTGEN_HEADERS})
+list(TRANSFORM RELATIVE_RES_HEADERS PREPEND res/)
+
+target_sources(Dictgen
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS res/
+  FILES
+    ${RELATIVE_RES_HEADERS}
+)
+
 # This directory contains files that include llvm, which can give warnings.
 if(NOT MSVC)
   target_compile_options(Dictgen PRIVATE -Wno-error)

core/foundation/CMakeLists.txt

@@ -8,7 +8,7 @@
 # CMakeLists.txt file for building ROOT core/foundation package
 ############################################################################
 
-set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
+set(FOUNDATION_HEADERS
   ESTLType.h
   TClassEdit.h
   TError.h
@@ -25,6 +25,8 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
   ROOT/TypeTraits.hxx
 )
 
+set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ${FOUNDATION_HEADERS})
+
 set(FOUNDATION_SOURCES
   src/FoundationUtils.cxx
   src/RConversionRuleParser.cxx
@@ -61,5 +63,28 @@ set_target_properties(Foundation_Stage1 PROPERTIES
   VISIBILITY_INLINES_HIDDEN "ON"
 )
 
+
+set(RELATIVE_INC_HEADERS ${FOUNDATION_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
+target_sources(
+  Foundation_Stage1
+  PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+)
+target_sources(
+  Core
+  PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+)
+
 ROOT_INSTALL_HEADERS(${FOUNDATION_HEADER_DIRS})
 ROOT_ADD_TEST_SUBDIRECTORY(test)

core/gui/CMakeLists.txt

@@ -8,7 +8,7 @@
 # CMakeLists.txt file for building ROOT core/meta package
 ############################################################################
 
-set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
+set(GUI_HEADERS
   GuiTypes.h
   TApplicationImp.h
   TBrowser.h
@@ -25,7 +25,13 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
   TToggle.h
 )
 
-target_sources(Core PRIVATE
+set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ${GUI_HEADERS})
+
+set(RELATIVE_INC_HEADERS ${GUI_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
+target_sources(Core
+PRIVATE
   src/InitGui.cxx
   src/TApplicationImp.cxx
   src/TBrowser.cxx
@@ -40,6 +46,12 @@ target_sources(Core PRIVATE
   src/TObjectSpy.cxx
   src/TToggle.cxx
   src/TToggleGroup.cxx
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
 )
 
 target_include_directories(Core PUBLIC

core/imt/CMakeLists.txt

@@ -25,14 +25,16 @@ target_link_libraries(Imt PRIVATE Thread INTERFACE Core)
 
 if(imt)
   target_link_libraries(Imt PRIVATE TBB::tbb)
-
-  ROOT_GENERATE_DICTIONARY(G__Imt STAGE1
+  set(IMT_HEADERS
     ROOT/TTaskGroup.hxx
     ROOT/RTaskArena.hxx
     ROOT/RSlotStack.hxx
     ROOT/TExecutor.hxx
     ROOT/TThreadExecutor.hxx
     ROOT/InternalIMTUtils.hxx
+  )
+  ROOT_GENERATE_DICTIONARY(G__Imt STAGE1
+    ${IMT_HEADERS}
     LINKDEF
       LinkDef.h
     MODULE
@@ -53,8 +55,11 @@ if(imt)
 
   ROOT_ADD_TEST_SUBDIRECTORY(test)
 else()
-  ROOT_GENERATE_DICTIONARY(G__Imt STAGE1
+  set(IMT_HEADERS
     ROOT/TExecutor.hxx
+  )
+  ROOT_GENERATE_DICTIONARY(G__Imt STAGE1
+    ${IMT_HEADERS}
     LINKDEF
       LinkDef.h
     MODULE
@@ -65,4 +70,17 @@ else()
   )
 endif()
 
+set(RELATIVE_INC_HEADERS ${IMT_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
+target_sources(Imt
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)
+
 ROOT_INSTALL_HEADERS()

core/lz4/CMakeLists.txt

@@ -4,7 +4,16 @@
 # For the licensing terms see $ROOTSYS/LICENSE.
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
-target_sources(Core PRIVATE src/ZipLZ4.cxx)
+target_sources(Core
+PRIVATE
+  src/ZipLZ4.cxx
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    inc/ZipLZ4.h
+)
 target_link_libraries(Core PRIVATE xxHash::xxHash LZ4::LZ4)
 target_include_directories(Core PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>

core/lzma/CMakeLists.txt

@@ -8,7 +8,16 @@
 # CMakeLists.txt file for building ROOT core/lzma package
 ############################################################################
 
-target_sources(Core PRIVATE src/ZipLZMA.c)
+target_sources(Core
+PRIVATE
+  src/ZipLZMA.c
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    inc/ZipLZMA.h
+)
 
 target_link_libraries(Core PRIVATE LibLZMA::LibLZMA)
 

core/macosx/CMakeLists.txt

@@ -36,6 +36,17 @@ if(cocoa)
 
   target_sources(Core PRIVATE $<TARGET_OBJECTS:Macosx>)
 
+  target_sources(Macosx
+  PRIVATE
+    FILE_SET private_header_files
+    TYPE HEADERS
+    BASE_DIRS inc/
+    FILES
+      inc/CocoaUtils.h
+      inc/TMacOSXSystem.h
+      inc/LinkDef.h
+  )
+
 endif()
 
 ROOT_INSTALL_HEADERS()

core/meta/CMakeLists.txt

@@ -8,7 +8,7 @@
 # CMakeLists.txt file for building ROOT core/meta package
 ############################################################################
 
-set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
+set(META_HEADERS
   TBaseClass.h
   TClassGenerator.h
   TClass.h
@@ -52,7 +52,13 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS
   TVirtualObject.h
 )
 
-target_sources(Core PRIVATE
+set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ${META_HEADERS})
+
+set(RELATIVE_INC_HEADERS ${META_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+
+target_sources(Core
+PRIVATE
   src/TBaseClass.cxx
   src/TClass.cxx
   src/TClassGenerator.cxx
@@ -86,6 +92,12 @@ target_sources(Core PRIVATE
   src/TViewPubDataMembers.cxx
   src/TViewPubFunctions.cxx
   src/TVirtualStreamerInfo.cxx
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
 )
 
 target_include_directories(Core