Merge branch 'master' into fix/hs3-patch

Author: Phmonski

README/ReleaseNotes/v642/index.md

@@ -73,7 +73,7 @@ fi
 newlib="-lNew"
 rootglibs="-lGui"
 rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
-rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer\
+rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lTGeometry -lGpad -lROOTVecOps -lTree -lTreePlayer\
           -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -lROOTNTuple -lROOTNTupleUtil"
 
 # MultiProc is not supported on Windows

config/root-config.in

@@ -4,21 +4,27 @@
 # For the licensing terms see $ROOTSYS/LICENSE.
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
-add_subdirectory(g3d) # special CMakeLists.txt
+add_subdirectory(g3d)
+
 if(NOT WIN32 AND x11)
-  add_subdirectory(x3d) # special CMakeLists.txt
+  add_subdirectory(x3d)
 endif()
 
-add_subdirectory(csg) # special CMakeLists.txt
+add_subdirectory(csg)
 
 if (opengl)
-  if(geom)
+  add_subdirectory(gl)
+endif()
+
+if(geom)
+  add_subdirectory(TGeometry)
+
+  if(opengl)
     add_subdirectory(eve)
     add_subdirectory(gviz3d)
   endif()
-  add_subdirectory(gl)
-endif()
 
-if(webgui AND root7 AND geom)
-  add_subdirectory(eve7) # special CMakeLists.txt
+  if(webgui AND root7)
+    add_subdirectory(eve7)
+  endif()
 endif()

graf3d/CMakeLists.txt

@@ -0,0 +1,68 @@
+# Copyright (C) 1995-2026, Rene Brun and Fons Rademakers.
+# All rights reserved.
+#
+# For the licensing terms see $ROOTSYS/LICENSE.
+# For the list of contributors see $ROOTSYS/README/CREDITS.
+
+############################################################################
+# CMakeLists.txt file for building ROOT's TGeometry package
+############################################################################
+
+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
+  SOURCES
+    TGeometry.cxx
+    TMaterial.cxx
+    TNode.cxx
+    TRotMatrix.cxx
+    TShape.cxx
+    TMixture.cxx
+    TBRIK.cxx
+    TCONE.cxx
+    TCONS.cxx
+    TCTUB.cxx
+    TELTU.cxx
+    TGTRA.cxx
+    THelix.cxx
+    THYPE.cxx
+    TNodeDiv.cxx
+    TPARA.cxx
+    TPCON.cxx
+    TPGON.cxx
+    TSPHE.cxx
+    TTRAP.cxx
+    TTRD1.cxx
+    TTRD2.cxx
+    TTUBE.cxx
+    TTUBS.cxx
+    TXTRU.cxx
+  DEPENDENCIES
+    Graf3d
+)
+
+ROOT_ADD_TEST_SUBDIRECTORY(test)

graf3d/TGeometry/CMakeLists.txt

@@ -0,0 +1,44 @@
+/*************************************************************************
+ * Copyright (C) 1995-2000, Rene Brun and Fons Rademakers.               *
+ * All rights reserved.                                                  *
+ *                                                                       *
+ * For the licensing terms see $ROOTSYS/LICENSE.                         *
+ * For the list of contributors see $ROOTSYS/README/CREDITS.             *
+ *************************************************************************/
+
+#ifdef __CLING__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ enum EHelixRangeType;
+
+#pragma link C++ global gGeometry;
+#pragma link C++ class TGeometry-;
+#pragma link C++ class TMaterial-;
+#pragma link C++ class TMixture-;
+#pragma link C++ class TNode-;
+#pragma link C++ class TRotMatrix-;
+#pragma link C++ class TShape-;
+#pragma link C++ class TBRIK+;
+#pragma link C++ class TCONE+;
+#pragma link C++ class TCONS+;
+#pragma link C++ class TCTUB-;
+#pragma link C++ class TELTU+;
+#pragma link C++ class TGTRA+;
+#pragma link C++ class THelix-;
+#pragma link C++ class THYPE+;
+#pragma link C++ class TNodeDiv+;
+#pragma link C++ class TPARA+;
+#pragma link C++ class TPCON-;
+#pragma link C++ class TPGON+;
+#pragma link C++ class TSPHE-;
+#pragma link C++ class TTRAP+;
+#pragma link C++ class TTRD1+;
+#pragma link C++ class TTRD2+;
+#pragma link C++ class TTUBE-;
+#pragma link C++ class TTUBS+;
+#pragma link C++ class TXTRU+;
+
+#endif