diff --git a/graf3d/TGeometry/CMakeLists.txt b/graf3d/TGeometry/CMakeLists.txt index 99d2d9fe18e6b..3beb9309db6bf 100644 --- a/graf3d/TGeometry/CMakeLists.txt +++ b/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) diff --git a/graf3d/eve/CMakeLists.txt b/graf3d/eve/CMakeLists.txt index 1248468ab29ca..2e958ff44ab5b 100644 --- a/graf3d/eve/CMakeLists.txt +++ b/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 diff --git a/graf3d/eve7/CMakeLists.txt b/graf3d/eve7/CMakeLists.txt index 3ba6caaf80cc0..c22d37235cb5d 100644 --- a/graf3d/eve7/CMakeLists.txt +++ b/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) diff --git a/graf3d/g3d/CMakeLists.txt b/graf3d/g3d/CMakeLists.txt index 6a9802b5f7734..2c1a7825864f6 100644 --- a/graf3d/g3d/CMakeLists.txt +++ b/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 +) diff --git a/graf3d/gl/CMakeLists.txt b/graf3d/gl/CMakeLists.txt index d343484a56248..e00edb74732ca 100644 --- a/graf3d/gl/CMakeLists.txt +++ b/graf3d/gl/CMakeLists.txt @@ -12,6 +12,96 @@ if(WIN32 OR cocoa) set(installoptions FILTER "TX11GL") endif() +set(RGL_HEADERS + TArcBall.h + TF2GL.h + TGL5D.h + TGL5DDataSetEditor.h + TGL5DPainter.h + TGLAdapter.h + TGLAnnotation.h + TGLAutoRotator.h + TGLAxis.h + TGLAxisPainter.h + TGLBoundingBox.h + TGLBoxPainter.h + TGLCamera.h + TGLCameraGuide.h + TGLCameraOverlay.h + TGLClip.h + TGLClipSetEditor.h + TGLContext.h + TGLCylinder.h + TGLEmbeddedViewer.h + TGLEventHandler.h + TGLFaceSet.h + TGLFBO.h + TGLFontManager.h + TGLFormat.h + TGLH2PolyPainter.h + TGLHistPainter.h + TGLIsoMesh.h + TGLLegoPainter.h + TGLLightSet.h + TGLLightSetEditor.h + TGLLockable.h + TGLLogicalShape.h + TGLManip.h + TGLManipSet.h + TGLMarchingCubes.h + TGLObject.h + TGLOrthoCamera.h + TGLOutput.h + TGLOverlay.h + TGLOverlayButton.h + TGLPadPainter.h + TGLPadUtils.h + TGLParametric.h + TGLParametricEquationGL.h + TGLPerspectiveCamera.h + TGLPhysicalShape.h + TGLPlot3D.h + TGLPlotBox.h + TGLPlotCamera.h + TGLPlotPainter.h + TGLPolyLine.h + TGLPolyMarker.h + TGLPShapeObj.h + TGLPShapeObjEditor.h + TGLPShapeRef.h + TGLQuadric.h + TGLRnrCtx.h + TGLRotateManip.h + TGLSAFrame.h + TGLSAViewer.h + TGLScaleManip.h + TGLScene.h + TGLSceneBase.h + TGLSceneInfo.h + TGLScenePad.h + TGLSdfFontMaker.h + TGLSelectBuffer.h + TGLSelectRecord.h + TGLSphere.h + TGLStopwatch.h + TGLSurfacePainter.h + TGLText.h + TGLTF3Painter.h + TGLTH3Composition.h + TGLTransManip.h + TGLUtil.h + TGLViewer.h + TGLViewerBase.h + TGLViewerEditor.h + TGLVoxelPainter.h + TGLWidget.h + TH2GL.h + TH3GL.h + TKDEAdapter.h + TKDEFGT.h + TPointSet3DGL.h +) + if(x11) set(RGL_EXTRA_HEADERS TX11GL.h) set(RGL_EXTRA_SOURCES TX11GL.cxx) @@ -19,88 +109,7 @@ endif() ROOT_STANDARD_LIBRARY_PACKAGE(RGL HEADERS - TArcBall.h - TF2GL.h - TGL5DDataSetEditor.h - TGL5D.h - TGLAdapter.h - TGLAnnotation.h - TGLAutoRotator.h - TGLAxis.h - TGLAxisPainter.h - TGLBoundingBox.h - TGLBoxPainter.h - TGLCameraGuide.h - TGLCamera.h - TGLCameraOverlay.h - TGLClip.h - TGLClipSetEditor.h - TGLContext.h - TGLCylinder.h - TGLEmbeddedViewer.h - TGLEventHandler.h - TGLFaceSet.h - TGLFBO.h - TGLFontManager.h - TGLFormat.h - TGLH2PolyPainter.h - TGLHistPainter.h - TGLLegoPainter.h - TGLLightSetEditor.h - TGLLightSet.h - TGLLockable.h - TGLLogicalShape.h - TGLManip.h - TGLManipSet.h - TGLObject.h - TGLOrthoCamera.h - TGLOutput.h - TGLOverlayButton.h - TGLOverlay.h - TGLPadPainter.h - TGLPadUtils.h - TGLParametricEquationGL.h - TGLParametric.h - TGLPerspectiveCamera.h - TGLPhysicalShape.h - TGLPlot3D.h - TGLPlotBox.h - TGLPlotCamera.h - TGLPlotPainter.h - TGLPolyLine.h - TGLPolyMarker.h - TGLPShapeObjEditor.h - TGLPShapeObj.h - TGLPShapeRef.h - TGLQuadric.h - TGLRnrCtx.h - TGLRotateManip.h - TGLSAFrame.h - TGLSAViewer.h - TGLScaleManip.h - TGLSceneBase.h - TGLScene.h - TGLSceneInfo.h - TGLScenePad.h - TGLSelectBuffer.h - TGLSelectRecord.h - TGLSphere.h - TGLStopwatch.h - TGLSurfacePainter.h - TGLText.h - TGLTF3Painter.h - TGLTH3Composition.h - TGLTransManip.h - TGLUtil.h - TGLViewerBase.h - TGLViewerEditor.h - TGLViewer.h - TGLVoxelPainter.h - TGLWidget.h - TH2GL.h - TH3GL.h - TPointSet3DGL.h - TGLSdfFontMaker.h + ${RGL_HEADERS} ${RGL_EXTRA_HEADERS} SOURCES src/TArcBall.cxx @@ -122,7 +131,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL src/TGLClipSetEditor.cxx src/TGLContext.cxx src/TGLContextPrivate.cxx - src/TGLContextPrivate.h src/TGLCylinder.cxx src/TGLEmbeddedViewer.cxx src/TGLEventHandler.cxx @@ -186,7 +194,6 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL src/TGLViewerEditor.cxx src/TGLVoxelPainter.cxx src/TGLWidget.cxx - src/TGLWSIncludes.h src/TH2GL.cxx src/TH3GL.cxx src/TKDEAdapter.cxx @@ -216,9 +223,22 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RGL ${installoptions} ) +set(RELATIVE_INC_HEADERS ${RGL_HEADERS} ${RGL_EXTRA_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +target_sources(RGL +PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ src/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h + src/TGLWSIncludes.h + src/TGLContextPrivate.h +) target_include_directories(RGL PRIVATE - ${OPENGL_INCLUDE_DIR} + ${OPENGL_INCLUDE_DIR} ) if(MACOSX_GLU_DEPRECATED) diff --git a/graf3d/gviz3d/CMakeLists.txt b/graf3d/gviz3d/CMakeLists.txt index 6e26ba6cf0c2b..08cbc7cf2a4f4 100644 --- a/graf3d/gviz3d/CMakeLists.txt +++ b/graf3d/gviz3d/CMakeLists.txt @@ -13,13 +13,17 @@ if (runtime_cxxmodules AND WIN32) set (EXTRA_DICT_OPTS NO_CXXMODULE) endif() +set(GVIZ3D_HEADERS + TStructNode.h + TStructNodeEditor.h + TStructNodeProperty.h + TStructViewer.h + TStructViewerGUI.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(Gviz3d HEADERS - TStructNode.h - TStructNodeEditor.h - TStructNodeProperty.h - TStructViewer.h - TStructViewerGUI.h + ${GVIZ3D_HEADERS} SOURCES src/TStructNode.cxx src/TStructNodeEditor.cxx @@ -35,3 +39,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Gviz3d RGL ${EXTRA_DICT_OPTS} ) + +set(RELATIVE_INC_HEADERS ${GVIZ3D_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +target_sources(Gviz3d +PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h +) diff --git a/graf3d/x3d/CMakeLists.txt b/graf3d/x3d/CMakeLists.txt index 8f882b6d2bc00..d1b000f142557 100644 --- a/graf3d/x3d/CMakeLists.txt +++ b/graf3d/x3d/CMakeLists.txt @@ -8,10 +8,14 @@ # CMakeLists.txt file for building ROOT graf3d/X3d C++ package ############################################################################ +set(X3D_HEADERS + TViewerX3D.h + TX3DFrame.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(X3d HEADERS - TViewerX3D.h - TX3DFrame.h + ${X3D_HEADERS} SOURCES src/TViewerX3D.cxx src/TX3DFrame.cxx @@ -21,3 +25,15 @@ ROOT_STANDARD_LIBRARY_PACKAGE(X3d LIBRARIES ROOTX3dViewer ) + +set(RELATIVE_INC_HEADERS ${X3D_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +target_sources(X3d +PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h +)