[graf2d] add headers to private file sets

graf2d/asimage/CMakeLists.txt

@@ -12,13 +12,16 @@
 
 if(asimage)
 
+  set(ASIMAGE_HEADERS 
+    TASImage.h
+    TASImagePlugin.h
+    TASPluginGS.h
+    TASPngWriter.h
+  )
   ROOT_STANDARD_LIBRARY_PACKAGE(ASImage
     NO_GLOB_HEADERS
     HEADERS
-      TASImage.h
-      TASImagePlugin.h
-      TASPluginGS.h
-      TASPngWriter.h
+      ${ASIMAGE_HEADERS}
     SOURCES
       TASImage.cxx
       TASPluginGS.cxx
@@ -32,17 +35,31 @@ if(asimage)
       Graf
       Postscript
   )
+
+  set(RELATIVE_INC_HEADERS ${ASIMAGE_HEADERS})
+  list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+  target_sources(ASImage
+  PRIVATE
+    FILE_SET private_header_files
+    TYPE HEADERS
+    BASE_DIRS inc/
+    FILES
+      ${RELATIVE_INC_HEADERS}
+      inc/LinkDef.h
+  )
 
   if (x11)
     target_link_libraries(ASImage PRIVATE X11::X11)
   endif()
 
 endif()
 
+set(ASIMAGEUTILS_HEADERS TASUtils.h)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(ASImageUtils
   NO_GLOB_HEADERS
   HEADERS
-    TASUtils.h
+    ${ASIMAGEUTILS_HEADERS}
   SOURCES
     TASUtils.cxx
   LINKDEF
@@ -53,14 +70,27 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ASImageUtils
     Gpad
 )
 
+set(RELATIVE_INC_HEADERS ${ASIMAGEUTILS_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(ASImageUtils
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDefUtils.h
+)
+
 if(asimage)
 
   target_link_libraries(ASImageUtils PUBLIC ASImage)
 
+  set(ASIMAGEGUI_HEADERS TASPaletteEditor.h)
   ROOT_STANDARD_LIBRARY_PACKAGE(ASImageGui
     NO_GLOB_HEADERS
     HEADERS
-      TASPaletteEditor.h
+      ${ASIMAGEGUI_HEADERS}
     SOURCES
       TASPaletteEditor.cxx
     LINKDEF
@@ -73,6 +103,17 @@ if(asimage)
       Gui
       ASImage
   )
+  set(RELATIVE_INC_HEADERS ${ASIMAGEGUI_HEADERS})
+  list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+  target_sources(ASImageGui
+  PRIVATE
+    FILE_SET private_header_files
+    TYPE HEADERS
+    BASE_DIRS inc/
+    FILES
+      ${RELATIVE_INC_HEADERS}
+      inc/LinkDefGui.h
+  )
 
   ROOT_ADD_TEST_SUBDIRECTORY(test)
 

graf2d/cocoa/CMakeLists.txt

@@ -12,12 +12,16 @@
 find_library(COCOA_FRAMEWORK Cocoa REQUIRED)
 find_library(OPENGL_FRAMEWORK OpenGL REQUIRED)
 
+set(GCOCOA_HEADERS
+  CocoaGuiTypes.h
+  TGCocoa.h
+  TGOSXGL.h
+  TGQuartz.h
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(GCocoa
   HEADERS
-    CocoaGuiTypes.h
-    TGCocoa.h
-    TGOSXGL.h
-    TGQuartz.h
+    ${GCOCOA_HEADERS}
   SOURCES
     src/CocoaConstants.mm
     src/CocoaGuiTypes.mm
@@ -45,6 +49,32 @@ ROOT_STANDARD_LIBRARY_PACKAGE(GCocoa
     Freetype::Freetype
 )
 
+set(RELATIVE_INC_HEADERS ${GCOCOA_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(GCocoa
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/ src/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/CocoaConstants.h
+    inc/FontCache.h
+    inc/MenuLoader.h
+    inc/QuartzPixmap.h
+    inc/QuartzWindow.h
+    inc/ROOTApplicationDelegate.h
+    inc/ROOTOpenGLView.h
+    inc/X11Atoms.h
+    inc/X11Buffer.h
+    inc/X11Colors.h
+    inc/X11Drawable.h
+    inc/X11Events.h
+    inc/XLFDParser.h
+    inc/LinkDef.h
+    src/CocoaPrivate.h
+)
+
 target_include_directories(GCocoa PRIVATE ${CMAKE_SOURCE_DIR}/graf3d/gl/inc)
 
 # We know GL is deprecated on macOS. And our answer is WebGUI/Graphics.

graf2d/fitsio/CMakeLists.txt

@@ -9,9 +9,11 @@
 # @author Pere Mato, CERN
 ############################################################################
 
+set(FITSIO_HEADERS TFITS.h)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(FITSIO
   HEADERS
-    TFITS.h
+    ${FITSIO_HEADERS}
   SOURCES
     TFITS.cxx
   DICTIONARY_OPTIONS
@@ -24,3 +26,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(FITSIO
     Hist
     Matrix
 )
+
+set(RELATIVE_INC_HEADERS ${FITSIO_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(FITSIO
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)

graf2d/gpad/CMakeLists.txt

@@ -9,29 +9,33 @@
 # @author Pere Mato, CERN
 ############################################################################
 
+set(GPAD_HEADERS
+  TAnnotation.h
+  TAttCanvas.h
+  TButton.h
+  TCanvas.h
+  TClassTree.h
+  TColorWheel.h
+  TControlBarButton.h
+  TControlBar.h
+  TCreatePrimitives.h
+  TDialogCanvas.h
+  TGroupButton.h
+  TInspectCanvas.h
+  TPad.h
+  TPadPainterBase.h
+  TPadPainterPS.h
+  TPaveClass.h
+  TRatioPlot.h
+  TSliderBox.h
+  TSlider.h
+  TViewer3DPad.h
+  TView.h
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(Gpad
   HEADERS
-    TAnnotation.h
-    TAttCanvas.h
-    TButton.h
-    TCanvas.h
-    TClassTree.h
-    TColorWheel.h
-    TControlBarButton.h
-    TControlBar.h
-    TCreatePrimitives.h
-    TDialogCanvas.h
-    TGroupButton.h
-    TInspectCanvas.h
-    TPad.h
-    TPadPainterBase.h
-    TPadPainterPS.h
-    TPaveClass.h
-    TRatioPlot.h
-    TSliderBox.h
-    TSlider.h
-    TViewer3DPad.h
-    TView.h
+    ${GPAD_HEADERS}
   SOURCES
     src/TAnnotation.cxx
     src/TAttCanvas.cxx
@@ -61,6 +65,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gpad
     Hist
 )
 
+set(RELATIVE_INC_HEADERS ${GPAD_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(Gpad
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)
+
 target_include_directories(Gpad PRIVATE ../graf/src)
 
 ROOT_ADD_TEST_SUBDIRECTORY(test)

graf2d/gpadv7/CMakeLists.txt

@@ -9,42 +9,46 @@
 # @author Pere Mato, CERN
 ############################################################################
 
+set(GPADV7_HEADERS
+  ROOT/RCanvas.hxx
+  ROOT/RFrame.hxx
+  ROOT/RMenuItems.hxx
+  ROOT/RColor.hxx
+  ROOT/RDisplayItem.hxx
+  ROOT/RAttrMap.hxx
+  ROOT/RAttrBase.hxx
+  ROOT/RAttrAggregation.hxx
+  ROOT/RAttrAxis.hxx
+  ROOT/RAttrBorder.hxx
+  ROOT/RAttrLine.hxx
+  ROOT/RAttrFill.hxx
+  ROOT/RAttrFont.hxx
+  ROOT/RAttrMarker.hxx
+  ROOT/RAttrMargins.hxx
+  ROOT/RAttrText.hxx
+  ROOT/RAttrValue.hxx
+  ROOT/RAxisDrawable.hxx
+  ROOT/RPalette.hxx
+  ROOT/RPaletteDrawable.hxx
+  ROOT/RDrawable.hxx
+  ROOT/ROnFrameDrawable.hxx
+  ROOT/RDrawableRequest.hxx
+  ROOT/RStyle.hxx
+  ROOT/RPadDisplayItem.hxx
+  ROOT/RPadExtent.hxx
+  ROOT/RPadBase.hxx
+  ROOT/RPad.hxx
+  ROOT/RPadLength.hxx
+  ROOT/RPadPos.hxx
+  ROOT/RPave.hxx
+  ROOT/RVirtualCanvasPainter.hxx
+  ROOT/TObjectDisplayItem.hxx
+  ROOT/TObjectDrawable.hxx
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGpadv7
   HEADERS
-    ROOT/RCanvas.hxx
-    ROOT/RFrame.hxx
-    ROOT/RMenuItems.hxx
-    ROOT/RColor.hxx
-    ROOT/RDisplayItem.hxx
-    ROOT/RAttrMap.hxx
-    ROOT/RAttrBase.hxx
-    ROOT/RAttrAggregation.hxx
-    ROOT/RAttrAxis.hxx
-    ROOT/RAttrBorder.hxx
-    ROOT/RAttrLine.hxx
-    ROOT/RAttrFill.hxx
-    ROOT/RAttrFont.hxx
-    ROOT/RAttrMarker.hxx
-    ROOT/RAttrMargins.hxx
-    ROOT/RAttrText.hxx
-    ROOT/RAttrValue.hxx
-    ROOT/RAxisDrawable.hxx
-    ROOT/RPalette.hxx
-    ROOT/RPaletteDrawable.hxx
-    ROOT/RDrawable.hxx
-    ROOT/ROnFrameDrawable.hxx
-    ROOT/RDrawableRequest.hxx
-    ROOT/RStyle.hxx
-    ROOT/RPadDisplayItem.hxx
-    ROOT/RPadExtent.hxx
-    ROOT/RPadBase.hxx
-    ROOT/RPad.hxx
-    ROOT/RPadLength.hxx
-    ROOT/RPadPos.hxx
-    ROOT/RPave.hxx
-    ROOT/RVirtualCanvasPainter.hxx
-    ROOT/TObjectDisplayItem.hxx
-    ROOT/TObjectDrawable.hxx
+    ${GPADV7_HEADERS}
   SOURCES
     src/RCanvas.cxx
     src/RFrame.cxx
@@ -72,4 +76,16 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTGpadv7
     RIO
 )
 
+set(RELATIVE_INC_HEADERS ${GPADV7_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(ROOTGpadv7
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+)
+
 ROOT_ADD_TEST_SUBDIRECTORY(test)