[graf3d] add headers to private file sets

graf3d/TGeometry/CMakeLists.txt

@@ -8,33 +8,37 @@
 # CMakeLists.txt file for building ROOT's TGeometry package
 ############################################################################
 
+set(TGEOMETRY_HEADERS
+  TGeometry.h
+  TMaterial.h
+  TNode.h
+  TRotMatrix.h
+  TShape.h
+  TMixture.h
+  TBRIK.h
+  TCONE.h
+  TCONS.h
+  TCTUB.h
+  TELTU.h
+  TGTRA.h
+  THelix.h
+  THYPE.h
+  TNodeDiv.h
+  TPARA.h
+  TPCON.h
+  TPGON.h
+  TSPHE.h
+  TTRAP.h
+  TTRD1.h
+  TTRD2.h
+  TTUBE.h
+  TTUBS.h
+  TXTRU.h
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(TGeometry
   HEADERS
-    TGeometry.h
-    TMaterial.h
-    TNode.h
-    TRotMatrix.h
-    TShape.h
-    TMixture.h
-    TBRIK.h
-    TCONE.h
-    TCONS.h
-    TCTUB.h
-    TELTU.h
-    TGTRA.h
-    THelix.h
-    THYPE.h
-    TNodeDiv.h
-    TPARA.h
-    TPCON.h
-    TPGON.h
-    TSPHE.h
-    TTRAP.h
-    TTRD1.h
-    TTRD2.h
-    TTUBE.h
-    TTUBS.h
-    TXTRU.h
+    ${TGEOMETRY_HEADERS}
   SOURCES
     TGeometry.cxx
     TMaterial.cxx
@@ -67,4 +71,16 @@ ROOT_STANDARD_LIBRARY_PACKAGE(TGeometry
     ROOTX3dViewer
 )
 
+set(RELATIVE_INC_HEADERS ${TGEOMETRY_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(TGeometry
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+  ${RELATIVE_INC_HEADERS}
+  inc/LinkDef.h
+)
+
 ROOT_ADD_TEST_SUBDIRECTORY(test)

graf3d/eve/CMakeLists.txt

@@ -41,6 +41,7 @@ set(EVE_HEADERS1
   TEveViewer.h
   TEveViewerListEditor.h
   TEveVSD.h
+  TEveVSDStructs.h
   TEveWindow.h
   TEveWindowEditor.h
   TEveWindowManager.h
@@ -247,6 +248,29 @@ if(MSVC)
       Eve
     MULTIDICT
   )
+
+  set(RELATIVE_INC_HEADERS ${EVE_HEADERS1})
+  list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+  target_sources(Eve
+  PRIVATE
+    FILE_SET private_header_files
+    TYPE HEADERS
+    BASE_DIRS inc/
+    FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef1.h
+  )
+  set(RELATIVE_INC_HEADERS ${EVE_HEADERS2})
+  list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+  target_sources(G__Eve2
+  PRIVATE
+    FILE_SET private_header_files
+    TYPE HEADERS
+    BASE_DIRS inc/
+    FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef2.h
+  )
 
   ROOT_INSTALL_HEADERS()
 else()
@@ -273,6 +297,19 @@ else()
       RGL
       Physics
   )
+  set(RELATIVE_INC_HEADERS ${EVE_HEADERS1} ${EVE_HEADERS2})
+  list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+  target_sources(Eve
+  PRIVATE
+    FILE_SET private_header_files
+    TYPE HEADERS
+    BASE_DIRS inc/
+    FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+    inc/LinkDef1.h
+    inc/LinkDef2.h
+  )
 endif()
 
 target_include_directories(Eve PRIVATE

graf3d/eve7/CMakeLists.txt

@@ -19,68 +19,72 @@ else ()
   endif()
 endif()
 
+set(ROOTEVE_HEADERS
+  ROOT/REveBox.hxx
+  ROOT/REveBoxSet.hxx
+  ROOT/REveCalo.hxx
+  ROOT/REveCaloData.hxx
+  ROOT/REveCamera.hxx
+  ROOT/REveChunkManager.hxx
+  ROOT/REveClient.hxx
+  ROOT/REveCompound.hxx
+  ROOT/REveDataCollection.hxx
+  ROOT/REveDataProxyBuilderBase.hxx
+  ROOT/REveDataSimpleProxyBuilder.hxx
+  ROOT/REveDataSimpleProxyBuilderTemplate.hxx
+  ROOT/REveDataTable.hxx
+  ROOT/REveDigitSet.hxx
+  ROOT/REveElement.hxx
+  ROOT/REveEllipsoid.hxx
+  ROOT/REveFrameBox.hxx
+  ROOT/REveGeoOverlaps.hxx
+  ROOT/REveGeoPolyShape.hxx
+  ROOT/REveGeoShape.hxx
+  ROOT/REveGeoShapeExtract.hxx
+  ROOT/REveGeoTopNode.hxx
+  ROOT/REveGluTess.hxx
+  ROOT/REveJetCone.hxx
+  ROOT/REveLine.hxx
+  ROOT/REveLogo.hxx
+  ROOT/REveManager.hxx
+  ROOT/REvePathMark.hxx
+  ROOT/REvePointSet.hxx
+  ROOT/REvePolygonSetProjected.hxx
+  ROOT/REveProjectionAxis.hxx
+  ROOT/REveProjectionBases.hxx
+  ROOT/REveProjectionManager.hxx
+  ROOT/REveProjections.hxx
+  ROOT/REveRGBAPalette.hxx
+  ROOT/REveRenderData.hxx
+  ROOT/REveSMorph.hxx
+  ROOT/REveScalableStraightLineSet.hxx
+  ROOT/REveScene.hxx
+  ROOT/REveSceneInfo.hxx
+  ROOT/REveSecondarySelectable.hxx
+  ROOT/REveSelection.hxx
+  ROOT/REveShape.hxx
+  ROOT/REveStraightLineSet.hxx
+  ROOT/REveSystem.hxx
+  ROOT/REveTableInfo.hxx
+  ROOT/REveTableProxyBuilder.hxx
+  ROOT/REveText.hxx
+  ROOT/REveTrack.hxx
+  ROOT/REveTrackProjected.hxx
+  ROOT/REveTrackPropagator.hxx
+  ROOT/REveTrans.hxx
+  ROOT/REveTreeTools.hxx
+  ROOT/REveTypes.hxx
+  ROOT/REveUtil.hxx
+  ROOT/REveVSD.hxx
+  ROOT/REveVSDStructs.hxx
+  ROOT/REveVector.hxx
+  ROOT/REveViewContext.hxx
+  ROOT/REveViewer.hxx
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(ROOTEve
   HEADERS
-    ROOT/REveChunkManager.hxx
-    ROOT/REveClient.hxx
-    ROOT/REveCompound.hxx
-    ROOT/REveBox.hxx
-    ROOT/REveBoxSet.hxx
-    ROOT/REveCaloData.hxx
-    ROOT/REveCalo.hxx
-    ROOT/REveDataCollection.hxx
-    ROOT/REveDataProxyBuilderBase.hxx
-    ROOT/REveDataSimpleProxyBuilder.hxx
-    ROOT/REveDataSimpleProxyBuilderTemplate.hxx
-    ROOT/REveDataTable.hxx
-    ROOT/REveDigitSet.hxx
-    ROOT/REveElement.hxx
-    ROOT/REveFrameBox.hxx
-    ROOT/REveGeoPolyShape.hxx
-    ROOT/REveGeoShapeExtract.hxx
-    ROOT/REveGeoShape.hxx
-    ROOT/REveGeoOverlaps.hxx
-    ROOT/REveGeoTopNode.hxx
-    ROOT/REveGluTess.hxx
-    ROOT/REveJetCone.hxx
-    ROOT/REveEllipsoid.hxx
-    ROOT/REveLine.hxx
-    ROOT/REveLogo.hxx
-    ROOT/REveManager.hxx
-    ROOT/REvePathMark.hxx
-    ROOT/REvePointSet.hxx
-    ROOT/REvePolygonSetProjected.hxx
-    ROOT/REveProjectionAxis.hxx
-    ROOT/REveProjectionBases.hxx
-    ROOT/REveProjectionManager.hxx
-    ROOT/REveProjections.hxx
-    ROOT/REveRenderData.hxx
-    ROOT/REveRGBAPalette.hxx
-    ROOT/REveScalableStraightLineSet.hxx
-    ROOT/REveScene.hxx
-    ROOT/REveSceneInfo.hxx
-    ROOT/REveSecondarySelectable.hxx
-    ROOT/REveSelection.hxx
-    ROOT/REveShape.hxx
-    ROOT/REveSMorph.hxx
-    ROOT/REveStraightLineSet.hxx
-    ROOT/REveSystem.hxx
-    ROOT/REveTableInfo.hxx
-    ROOT/REveTableProxyBuilder.hxx
-    ROOT/REveText.hxx
-    ROOT/REveTrack.hxx
-    ROOT/REveTrackProjected.hxx
-    ROOT/REveTrackPropagator.hxx
-    ROOT/REveTrans.hxx
-    ROOT/REveTreeTools.hxx
-    ROOT/REveTypes.hxx
-    ROOT/REveUtil.hxx
-    ROOT/REveVector.hxx
-    ROOT/REveViewer.hxx
-    ROOT/REveCamera.hxx
-    ROOT/REveViewContext.hxx
-    ROOT/REveVSD.hxx
-    ROOT/REveVSDStructs.hxx
+    ${ROOTEVE_HEADERS}
   SOURCES
     src/REveChunkManager.cxx
     src/REveBox.cxx
@@ -153,6 +157,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTEve
   ${EXTRA_DICT_OPTS}
 )
 
+set(RELATIVE_INC_HEADERS ${ROOTEVE_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(ROOTEve
+  PRIVATE
+    FILE_SET private_header_files
+    TYPE HEADERS
+    BASE_DIRS inc/
+    FILES
+    ${RELATIVE_INC_HEADERS}
+    inc/LinkDef.h
+  )
+
 target_link_libraries(ROOTEve PUBLIC nlohmann_json::nlohmann_json)
 
 if (APPLE AND NOT builtin_glu)

graf3d/g3d/CMakeLists.txt

@@ -8,16 +8,20 @@
 # CMakeLists.txt file for building ROOT graf3d/g3d package
 ############################################################################
 
+set(GRAF3D_HEADERS
+  TAxis3D.h
+  TGeometryTransformer.h
+  TMarker3DBox.h
+  TPoints3DABC.h
+  TPointSet3D.h
+  TPolyLine3D.h
+  TPolyMarker3D.h
+  TView3D.h
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(Graf3d
   HEADERS
-    TAxis3D.h
-    TGeometryTransformer.h
-    TMarker3DBox.h
-    TPoints3DABC.h
-    TPointSet3D.h
-    TPolyLine3D.h
-    TPolyMarker3D.h
-    TView3D.h
+    ${GRAF3D_HEADERS}
   SOURCES
     TAxis3D.cxx
     TMarker3DBox.cxx
@@ -34,3 +38,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Graf3d
   LIBRARIES
     ROOTX3dViewer
 )
+
+set(RELATIVE_INC_HEADERS ${GRAF3D_HEADERS})
+list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
+target_sources(Graf3d
+PRIVATE
+  FILE_SET private_header_files
+  TYPE HEADERS
+  BASE_DIRS inc/
+  FILES
+  ${RELATIVE_INC_HEADERS}
+  inc/LinkDef.h
+)