[gui] add headers to private file_sets

gui/browsable/CMakeLists.txt

@@ -8,25 +8,29 @@
 # CMakeLists.txt file for building ROOT gui/browsable
 ############################################################################
 
+set(BROWSABLE_HEADERS
+  ROOT/Browsable/RAnyObjectHolder.hxx
+  ROOT/Browsable/RElement.hxx
+  ROOT/Browsable/RGroup.hxx
+  ROOT/Browsable/RHolder.hxx
+  ROOT/Browsable/RItem.hxx
+  ROOT/Browsable/RLevelIter.hxx
+  ROOT/Browsable/RProvider.hxx
+  ROOT/Browsable/RShared.hxx
+  ROOT/Browsable/RSysFile.hxx
+  ROOT/Browsable/RSysFileItem.hxx
+  ROOT/Browsable/RUnique.hxx
+  ROOT/Browsable/RWrapper.hxx
+  ROOT/Browsable/TKeyItem.hxx
+  ROOT/Browsable/TObjectElement.hxx
+  ROOT/Browsable/TObjectHolder.hxx
+  ROOT/Browsable/TObjectItem.hxx
+  ROOT/Browsable/RNTupleItem.hxx
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(ROOTBrowsable
   HEADERS
-    ROOT/Browsable/RAnyObjectHolder.hxx
-    ROOT/Browsable/RElement.hxx
-    ROOT/Browsable/RGroup.hxx
-    ROOT/Browsable/RHolder.hxx
-    ROOT/Browsable/RItem.hxx
-    ROOT/Browsable/RLevelIter.hxx
-    ROOT/Browsable/RProvider.hxx
-    ROOT/Browsable/RShared.hxx
-    ROOT/Browsable/RSysFile.hxx
-    ROOT/Browsable/RSysFileItem.hxx
-    ROOT/Browsable/RUnique.hxx
-    ROOT/Browsable/RWrapper.hxx
-    ROOT/Browsable/TKeyItem.hxx
-    ROOT/Browsable/TObjectElement.hxx
-    ROOT/Browsable/TObjectHolder.hxx
-    ROOT/Browsable/TObjectItem.hxx
-    ROOT/Browsable/RNTupleItem.hxx
+    ${BROWSABLE_HEADERS}
   SOURCES
     src/RElement.cxx
     src/RGroup.cxx
@@ -41,6 +45,23 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTBrowsable
     Hist
 )
 
+set(RELATIVE_INC_HEADERS ${BROWSABLE_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(ROOTBrowsable
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/ src/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+    src/RFieldHolder.hxx
+    src/RFieldProvider.hxx
+    src/RVisualizationHolder.hxx
+    src/RVisualizationProvider.hxx
+    src/TLeafProvider.hxx
+)
+
 # provider for generic drawing of TObject on TCanvas
 
 ROOT_LINKER_LIBRARY(ROOTObjectDraw6Provider

gui/browserv7/CMakeLists.txt

@@ -49,14 +49,18 @@ ROOT_LINKER_LIBRARY(ROOTBrowserTreeWidget
      ROOTTreeViewer
 )
 
+set(BROWSERV7_HEADERS
+  ROOT/RBrowser.hxx
+  ROOT/RBrowserData.hxx
+  ROOT/RBrowserReply.hxx
+  ROOT/RBrowserRequest.hxx
+  ROOT/RFileDialog.hxx
+  ROOT/RWebBrowserImp.hxx
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(ROOTBrowserv7
   HEADERS
-    ROOT/RBrowser.hxx
-    ROOT/RBrowserData.hxx
-    ROOT/RBrowserReply.hxx
-    ROOT/RBrowserRequest.hxx
-    ROOT/RFileDialog.hxx
-    ROOT/RWebBrowserImp.hxx
+    ${BROWSERV7_HEADERS}
   SOURCES
     src/RBrowser.cxx
     src/RBrowserData.cxx
@@ -70,4 +74,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTBrowserv7
     RIO
 )
 
+set(RELATIVE_INC_HEADERS ${BROWSERV7_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(ROOTBrowsable
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)
 

gui/cefdisplay/CMakeLists.txt

@@ -62,6 +62,16 @@ set(CEF_MAIN src/cef_main.cxx)
 ROOT_LINKER_LIBRARY(${libname} ${CEF_sources} ${CEF_platform}
                     LIBRARIES ${CMAKE_DL_LIBS} ${CEF_LIBRARY} ${CEF_DLL_WRAPPER} ${CEF_LIB_DEPENDENCY}
                     DEPENDENCIES RHTTP ASImage ROOTWebDisplay)
+target_sources(${libname}
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    inc/gui_handler.h
+    inc/RCefWebDisplayHandle.hxx
+    inc/simple_app.h
+)
 
 target_compile_definitions(${libname} PRIVATE NDEBUG)
 

gui/fitpanel/CMakeLists.txt

@@ -8,12 +8,16 @@
 # CMakeLists.txt file for building ROOT gui/fitpanel package
 ############################################################################
 
+set(FITPANEL_HEADERS
+  TAdvancedGraphicsDialog.h
+  TFitEditor.h
+  TFitParametersDialog.h
+  TTreeInput.h
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(FitPanel
   HEADERS
-    TAdvancedGraphicsDialog.h
-    TFitEditor.h
-    TFitParametersDialog.h
-    TTreeInput.h
+    ${FITPANEL_HEADERS}
   SOURCES
     src/TAdvancedGraphicsDialog.cxx
     src/TFitEditor.cxx
@@ -31,4 +35,17 @@ ROOT_STANDARD_LIBRARY_PACKAGE(FitPanel
     TreePlayer
 )
 
+set(RELATIVE_INC_HEADERS ${FITPANEL_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(FitPanel
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/ src/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+    src/CommonDefs.h
+)
+
 ROOT_ADD_TEST_SUBDIRECTORY(test)

gui/fitpanelv7/CMakeLists.txt

@@ -13,10 +13,14 @@ if (runtime_cxxmodules AND WIN32)
   set (EXTRA_DICT_OPTS NO_CXXMODULE)
 endif()
 
+set(FITPANELV7_HEADERS
+  ROOT/RFitPanel.hxx
+  ROOT/RFitPanelModel.hxx
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(ROOTFitPanelv7
   HEADERS
-    ROOT/RFitPanel.hxx
-    ROOT/RFitPanelModel.hxx
+    ${FITPANELV7_HEADERS}
   SOURCES
     RFitPanel.cxx
     RFitPanelModel.cxx
@@ -29,3 +33,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTFitPanelv7
     ROOTGpadv7
   ${EXTRA_DICT_OPTS}
 )
+
+set(RELATIVE_INC_HEADERS ${FITPANELV7_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(ROOTFitPanelv7
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)

gui/ged/CMakeLists.txt

@@ -13,36 +13,40 @@ if (runtime_cxxmodules AND WIN32)
   set (EXTRA_DICT_OPTS NO_CXXMODULE)
 endif()
 
+set(GED_HEADERS
+  HelpSMText.h
+  TArrowEditor.h
+  TAttFillEditor.h
+  TAttLineEditor.h
+  TAttMarkerEditor.h
+  TAttTextEditor.h
+  TAxisEditor.h
+  TCurlyArcEditor.h
+  TCurlyLineEditor.h
+  TF1Editor.h
+  TFrameEditor.h
+  TFunctionParametersDialog.h
+  TGedEditor.h
+  TGedFrame.h
+  TGedMarkerSelect.h
+  TGedPatternSelect.h
+  TGraphEditor.h
+  TH1Editor.h
+  TH2Editor.h
+  TLineEditor.h
+  TPadEditor.h
+  TPaveStatsEditor.h
+  TPieEditor.h
+  TPieSliceEditor.h
+  TStyleDialog.h
+  TStyleManager.h
+  TStylePreview.h
+  TTextEditor.h
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(Ged
   HEADERS
-    HelpSMText.h
-    TArrowEditor.h
-    TAttFillEditor.h
-    TAttLineEditor.h
-    TAttMarkerEditor.h
-    TAttTextEditor.h
-    TAxisEditor.h
-    TCurlyArcEditor.h
-    TCurlyLineEditor.h
-    TF1Editor.h
-    TFrameEditor.h
-    TFunctionParametersDialog.h
-    TGedEditor.h
-    TGedFrame.h
-    TGedMarkerSelect.h
-    TGedPatternSelect.h
-    TGraphEditor.h
-    TH1Editor.h
-    TH2Editor.h
-    TLineEditor.h
-    TPadEditor.h
-    TPaveStatsEditor.h
-    TPieEditor.h
-    TPieSliceEditor.h
-    TStyleDialog.h
-    TStyleManager.h
-    TStylePreview.h
-    TTextEditor.h
+    ${GED_HEADERS}
   SOURCES
     src/HelpSMText.cxx
     src/TArrowEditor.cxx
@@ -81,3 +85,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Ged
     TreePlayer
   ${EXTRA_DICT_OPTS}
 )
+
+set(RELATIVE_INC_HEADERS ${GED_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(Ged
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)