diff --git a/README/ReleaseNotes/v642/index.md b/README/ReleaseNotes/v642/index.md index 707ccc265c02d..d2687ab1e807a 100644 --- a/README/ReleaseNotes/v642/index.md +++ b/README/ReleaseNotes/v642/index.md @@ -40,6 +40,7 @@ The following people have contributed to this new version: ## Deprecation and Removal +* Starting from ROOT 6.42, the recommended way to include headers is to use e.g `` instead of the traditional `"TCanvas.h"`. The traditional variant will stop working in ROOT 7, a point at which you will need to either add that prefix in all your scripts, or alternatively add the extra ROOT/ folder to the global search include paths of your program. * The build options `vc`, `veccore`, `builtin_vc`, `builtin_veccore` and `rpath` that were deprecated are now removed and will result in configuration errors if used. * The option `fail-on-missing=OFF` is no longer honored for opt-in (ie OFF by default) build options requiring external dependencies such as `arrow`, `cocoa`, `daos`, `daos_mock`, `dcache`, `experimental_adaptivecpp`, `fcgi`, `fortran`, `gviz`, `mpi`, `pythia8`, `qt6web`, `tmva-cudnn`, `tmva-pymva`, `tmva-sofie`, `uring` or `vecgeom`. If the respective associated package dependency is not installed, ROOT will always raise a configuration error independent of the value of `fail-on-missing`. The user has to take action by either providing the dependency or manually disabling that option via `-Darrow=OFF`. Note that `all=ON` enables several of these options, so building with `-Dall=ON` now requires all of their dependencies to be installed, or the unwanted ones to be disabled explicitly. diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt index f6b8a0be390cd..3230c56c33064 100644 --- a/core/base/CMakeLists.txt +++ b/core/base/CMakeLists.txt @@ -22,98 +22,98 @@ set(BASE_HEADERS ROOT/TExecutorCRTP.hxx ROOT/TSequentialExecutor.hxx ROOT/StringConv.hxx - Buttons.h - Bytes.h - Byteswap.h - KeySymbols.h - MessageTypes.h + ROOT/Buttons.h + ROOT/Bytes.h + ROOT/Byteswap.h + ROOT/KeySymbols.h + ROOT/MessageTypes.h Riostream.h - Rtypes.h - TApplication.h - TAtt3D.h - TAttAxis.h - TAttBBox2D.h - TAttBBox.h - TAttFill.h - TAttLine.h - TAttMarker.h - TAttPad.h - TAttText.h - TBase64.h - TBenchmark.h - TBuffer3D.h - TBuffer3DTypes.h - TBuffer.h - TColor.h - TColorGradient.h - TDatime.h - TDirectory.h - TEnv.h - TException.h - TExec.h - TFileCollection.h - TFileInfo.h - TFolder.h - TInetAddress.h - TMacro.h - TMathBase.h - TMD5.h - TMemberInspector.h - TMessageHandler.h - TNamed.h - TNotifyLink.h - TObject.h - TObjString.h - TParameter.h - TPluginManager.h - TPoint.h - TPRegexp.h - TProcessID.h - TProcessUUID.h - TQClass.h - TQCommand.h - TQConnection.h - TQObject.h - TRedirectOutputGuard.h - TRefCnt.h - TRef.h - TRegexp.h - TRemoteObject.h - TROOT.h - TRootIOCtor.h - TStopwatch.h - TStorage.h - TString.h - TStringLong.h - TStyle.h - TSysEvtHandler.h - TSystemDirectory.h - TSystemFile.h - TSystem.h - TTask.h - TThreadSlots.h - TTime.h - TTimer.h - TTimeStamp.h - TUri.h - TUrl.h - TUUID.h - TVersionCheck.h - TVirtualFFT.h - TVirtualGL.h - TVirtualMonitoring.h - TVirtualMapFile.h - TVirtualMutex.h - TVirtualPadEditor.h - TVirtualPad.h - TVirtualPadPainter.h - TVirtualPerfStats.h - TVirtualPS.h - TVirtualQConnection.h - TVirtualRWMutex.h - TVirtualTableInterface.h - TVirtualViewer3D.h - TVirtualX.h + ROOT/Rtypes.h + ROOT/TApplication.h + ROOT/TAtt3D.h + ROOT/TAttAxis.h + ROOT/TAttBBox2D.h + ROOT/TAttBBox.h + ROOT/TAttFill.h + ROOT/TAttLine.h + ROOT/TAttMarker.h + ROOT/TAttPad.h + ROOT/TAttText.h + ROOT/TBase64.h + ROOT/TBenchmark.h + ROOT/TBuffer3D.h + ROOT/TBuffer3DTypes.h + ROOT/TBuffer.h + ROOT/TColor.h + ROOT/TColorGradient.h + ROOT/TDatime.h + ROOT/TDirectory.h + ROOT/TEnv.h + ROOT/TException.h + ROOT/TExec.h + ROOT/TFileCollection.h + ROOT/TFileInfo.h + ROOT/TFolder.h + ROOT/TInetAddress.h + ROOT/TMacro.h + ROOT/TMathBase.h + ROOT/TMD5.h + ROOT/TMemberInspector.h + ROOT/TMessageHandler.h + ROOT/TNamed.h + ROOT/TNotifyLink.h + ROOT/TObject.h + ROOT/TObjString.h + ROOT/TParameter.h + ROOT/TPluginManager.h + ROOT/TPoint.h + ROOT/TPRegexp.h + ROOT/TProcessID.h + ROOT/TProcessUUID.h + ROOT/TQClass.h + ROOT/TQCommand.h + ROOT/TQConnection.h + ROOT/TQObject.h + ROOT/TRedirectOutputGuard.h + ROOT/TRefCnt.h + ROOT/TRef.h + ROOT/TRegexp.h + ROOT/TRemoteObject.h + ROOT/TROOT.h + ROOT/TRootIOCtor.h + ROOT/TStopwatch.h + ROOT/TStorage.h + ROOT/TString.h + ROOT/TStringLong.h + ROOT/TStyle.h + ROOT/TSysEvtHandler.h + ROOT/TSystemDirectory.h + ROOT/TSystemFile.h + ROOT/TSystem.h + ROOT/TTask.h + ROOT/TThreadSlots.h + ROOT/TTime.h + ROOT/TTimer.h + ROOT/TTimeStamp.h + ROOT/TUri.h + ROOT/TUrl.h + ROOT/TUUID.h + ROOT/TVersionCheck.h + ROOT/TVirtualFFT.h + ROOT/TVirtualGL.h + ROOT/TVirtualMonitoring.h + ROOT/TVirtualMapFile.h + ROOT/TVirtualMutex.h + ROOT/TVirtualPadEditor.h + ROOT/TVirtualPad.h + ROOT/TVirtualPadPainter.h + ROOT/TVirtualPerfStats.h + ROOT/TVirtualPS.h + ROOT/TVirtualQConnection.h + ROOT/TVirtualRWMutex.h + ROOT/TVirtualTableInterface.h + ROOT/TVirtualViewer3D.h + ROOT/TVirtualX.h ) set(BASE_SOURCES @@ -222,6 +222,7 @@ endif() target_include_directories(Core PUBLIC $ + $ # bw compatibility ) target_include_directories(Core PRIVATE ${CMAKE_SOURCE_DIR}/core/utils/inc) diff --git a/core/base/inc/Bswapcpy.h b/core/base/inc/ROOT/Bswapcpy.h similarity index 100% rename from core/base/inc/Bswapcpy.h rename to core/base/inc/ROOT/Bswapcpy.h diff --git a/core/base/inc/Buttons.h b/core/base/inc/ROOT/Buttons.h similarity index 100% rename from core/base/inc/Buttons.h rename to core/base/inc/ROOT/Buttons.h diff --git a/core/base/inc/Bytes.h b/core/base/inc/ROOT/Bytes.h similarity index 100% rename from core/base/inc/Bytes.h rename to core/base/inc/ROOT/Bytes.h diff --git a/core/base/inc/Byteswap.h b/core/base/inc/ROOT/Byteswap.h similarity index 100% rename from core/base/inc/Byteswap.h rename to core/base/inc/ROOT/Byteswap.h diff --git a/core/base/inc/KeySymbols.h b/core/base/inc/ROOT/KeySymbols.h similarity index 100% rename from core/base/inc/KeySymbols.h rename to core/base/inc/ROOT/KeySymbols.h diff --git a/core/base/inc/Match.h b/core/base/inc/ROOT/Match.h similarity index 100% rename from core/base/inc/Match.h rename to core/base/inc/ROOT/Match.h diff --git a/core/base/inc/MessageTypes.h b/core/base/inc/ROOT/MessageTypes.h similarity index 100% rename from core/base/inc/MessageTypes.h rename to core/base/inc/ROOT/MessageTypes.h diff --git a/core/base/inc/RQ_OBJECT.h b/core/base/inc/ROOT/RQ_OBJECT.h similarity index 100% rename from core/base/inc/RQ_OBJECT.h rename to core/base/inc/ROOT/RQ_OBJECT.h diff --git a/core/base/inc/RStipples.h b/core/base/inc/ROOT/RStipples.h similarity index 100% rename from core/base/inc/RStipples.h rename to core/base/inc/ROOT/RStipples.h diff --git a/core/base/inc/Rtypes.h b/core/base/inc/ROOT/Rtypes.h similarity index 100% rename from core/base/inc/Rtypes.h rename to core/base/inc/ROOT/Rtypes.h diff --git a/core/base/inc/RtypesImp.h b/core/base/inc/ROOT/RtypesImp.h similarity index 100% rename from core/base/inc/RtypesImp.h rename to core/base/inc/ROOT/RtypesImp.h diff --git a/core/base/inc/TApplication.h b/core/base/inc/ROOT/TApplication.h similarity index 100% rename from core/base/inc/TApplication.h rename to core/base/inc/ROOT/TApplication.h diff --git a/core/base/inc/TAtt3D.h b/core/base/inc/ROOT/TAtt3D.h similarity index 100% rename from core/base/inc/TAtt3D.h rename to core/base/inc/ROOT/TAtt3D.h diff --git a/core/base/inc/TAttAxis.h b/core/base/inc/ROOT/TAttAxis.h similarity index 100% rename from core/base/inc/TAttAxis.h rename to core/base/inc/ROOT/TAttAxis.h diff --git a/core/base/inc/TAttBBox.h b/core/base/inc/ROOT/TAttBBox.h similarity index 100% rename from core/base/inc/TAttBBox.h rename to core/base/inc/ROOT/TAttBBox.h diff --git a/core/base/inc/TAttBBox2D.h b/core/base/inc/ROOT/TAttBBox2D.h similarity index 100% rename from core/base/inc/TAttBBox2D.h rename to core/base/inc/ROOT/TAttBBox2D.h diff --git a/core/base/inc/TAttFill.h b/core/base/inc/ROOT/TAttFill.h similarity index 100% rename from core/base/inc/TAttFill.h rename to core/base/inc/ROOT/TAttFill.h diff --git a/core/base/inc/TAttLine.h b/core/base/inc/ROOT/TAttLine.h similarity index 100% rename from core/base/inc/TAttLine.h rename to core/base/inc/ROOT/TAttLine.h diff --git a/core/base/inc/TAttMarker.h b/core/base/inc/ROOT/TAttMarker.h similarity index 100% rename from core/base/inc/TAttMarker.h rename to core/base/inc/ROOT/TAttMarker.h diff --git a/core/base/inc/TAttPad.h b/core/base/inc/ROOT/TAttPad.h similarity index 100% rename from core/base/inc/TAttPad.h rename to core/base/inc/ROOT/TAttPad.h diff --git a/core/base/inc/TAttText.h b/core/base/inc/ROOT/TAttText.h similarity index 100% rename from core/base/inc/TAttText.h rename to core/base/inc/ROOT/TAttText.h diff --git a/core/base/inc/TBase64.h b/core/base/inc/ROOT/TBase64.h similarity index 100% rename from core/base/inc/TBase64.h rename to core/base/inc/ROOT/TBase64.h diff --git a/core/base/inc/TBenchmark.h b/core/base/inc/ROOT/TBenchmark.h similarity index 100% rename from core/base/inc/TBenchmark.h rename to core/base/inc/ROOT/TBenchmark.h diff --git a/core/base/inc/TBuffer.h b/core/base/inc/ROOT/TBuffer.h similarity index 100% rename from core/base/inc/TBuffer.h rename to core/base/inc/ROOT/TBuffer.h diff --git a/core/base/inc/TBuffer3D.h b/core/base/inc/ROOT/TBuffer3D.h similarity index 100% rename from core/base/inc/TBuffer3D.h rename to core/base/inc/ROOT/TBuffer3D.h diff --git a/core/base/inc/TBuffer3DTypes.h b/core/base/inc/ROOT/TBuffer3DTypes.h similarity index 100% rename from core/base/inc/TBuffer3DTypes.h rename to core/base/inc/ROOT/TBuffer3DTypes.h diff --git a/core/base/inc/TColor.h b/core/base/inc/ROOT/TColor.h similarity index 100% rename from core/base/inc/TColor.h rename to core/base/inc/ROOT/TColor.h diff --git a/core/base/inc/TColorGradient.h b/core/base/inc/ROOT/TColorGradient.h similarity index 100% rename from core/base/inc/TColorGradient.h rename to core/base/inc/ROOT/TColorGradient.h diff --git a/core/base/inc/TDatime.h b/core/base/inc/ROOT/TDatime.h similarity index 100% rename from core/base/inc/TDatime.h rename to core/base/inc/ROOT/TDatime.h diff --git a/core/base/inc/TDirectory.h b/core/base/inc/ROOT/TDirectory.h similarity index 100% rename from core/base/inc/TDirectory.h rename to core/base/inc/ROOT/TDirectory.h diff --git a/core/base/inc/TEnv.h b/core/base/inc/ROOT/TEnv.h similarity index 100% rename from core/base/inc/TEnv.h rename to core/base/inc/ROOT/TEnv.h diff --git a/core/base/inc/TException.h b/core/base/inc/ROOT/TException.h similarity index 100% rename from core/base/inc/TException.h rename to core/base/inc/ROOT/TException.h diff --git a/core/base/inc/TExec.h b/core/base/inc/ROOT/TExec.h similarity index 100% rename from core/base/inc/TExec.h rename to core/base/inc/ROOT/TExec.h diff --git a/core/base/inc/TFileCollection.h b/core/base/inc/ROOT/TFileCollection.h similarity index 100% rename from core/base/inc/TFileCollection.h rename to core/base/inc/ROOT/TFileCollection.h diff --git a/core/base/inc/TFileInfo.h b/core/base/inc/ROOT/TFileInfo.h similarity index 100% rename from core/base/inc/TFileInfo.h rename to core/base/inc/ROOT/TFileInfo.h diff --git a/core/base/inc/TFolder.h b/core/base/inc/ROOT/TFolder.h similarity index 100% rename from core/base/inc/TFolder.h rename to core/base/inc/ROOT/TFolder.h diff --git a/core/base/inc/TInetAddress.h b/core/base/inc/ROOT/TInetAddress.h similarity index 100% rename from core/base/inc/TInetAddress.h rename to core/base/inc/ROOT/TInetAddress.h diff --git a/core/base/inc/TMD5.h b/core/base/inc/ROOT/TMD5.h similarity index 100% rename from core/base/inc/TMD5.h rename to core/base/inc/ROOT/TMD5.h diff --git a/core/base/inc/TMacro.h b/core/base/inc/ROOT/TMacro.h similarity index 100% rename from core/base/inc/TMacro.h rename to core/base/inc/ROOT/TMacro.h diff --git a/core/base/inc/TMathBase.h b/core/base/inc/ROOT/TMathBase.h similarity index 100% rename from core/base/inc/TMathBase.h rename to core/base/inc/ROOT/TMathBase.h diff --git a/core/base/inc/TMemberInspector.h b/core/base/inc/ROOT/TMemberInspector.h similarity index 100% rename from core/base/inc/TMemberInspector.h rename to core/base/inc/ROOT/TMemberInspector.h diff --git a/core/base/inc/TMessageHandler.h b/core/base/inc/ROOT/TMessageHandler.h similarity index 100% rename from core/base/inc/TMessageHandler.h rename to core/base/inc/ROOT/TMessageHandler.h diff --git a/core/base/inc/TNamed.h b/core/base/inc/ROOT/TNamed.h similarity index 100% rename from core/base/inc/TNamed.h rename to core/base/inc/ROOT/TNamed.h diff --git a/core/base/inc/TNotifyLink.h b/core/base/inc/ROOT/TNotifyLink.h similarity index 100% rename from core/base/inc/TNotifyLink.h rename to core/base/inc/ROOT/TNotifyLink.h diff --git a/core/base/inc/TObjString.h b/core/base/inc/ROOT/TObjString.h similarity index 100% rename from core/base/inc/TObjString.h rename to core/base/inc/ROOT/TObjString.h diff --git a/core/base/inc/TObject.h b/core/base/inc/ROOT/TObject.h similarity index 100% rename from core/base/inc/TObject.h rename to core/base/inc/ROOT/TObject.h diff --git a/core/base/inc/TPRegexp.h b/core/base/inc/ROOT/TPRegexp.h similarity index 100% rename from core/base/inc/TPRegexp.h rename to core/base/inc/ROOT/TPRegexp.h diff --git a/core/base/inc/TParameter.h b/core/base/inc/ROOT/TParameter.h similarity index 100% rename from core/base/inc/TParameter.h rename to core/base/inc/ROOT/TParameter.h diff --git a/core/base/inc/TPluginManager.h b/core/base/inc/ROOT/TPluginManager.h similarity index 100% rename from core/base/inc/TPluginManager.h rename to core/base/inc/ROOT/TPluginManager.h diff --git a/core/base/inc/TPoint.h b/core/base/inc/ROOT/TPoint.h similarity index 100% rename from core/base/inc/TPoint.h rename to core/base/inc/ROOT/TPoint.h diff --git a/core/base/inc/TProcessID.h b/core/base/inc/ROOT/TProcessID.h similarity index 100% rename from core/base/inc/TProcessID.h rename to core/base/inc/ROOT/TProcessID.h diff --git a/core/base/inc/TProcessUUID.h b/core/base/inc/ROOT/TProcessUUID.h similarity index 100% rename from core/base/inc/TProcessUUID.h rename to core/base/inc/ROOT/TProcessUUID.h diff --git a/core/base/inc/TQClass.h b/core/base/inc/ROOT/TQClass.h similarity index 100% rename from core/base/inc/TQClass.h rename to core/base/inc/ROOT/TQClass.h diff --git a/core/base/inc/TQCommand.h b/core/base/inc/ROOT/TQCommand.h similarity index 100% rename from core/base/inc/TQCommand.h rename to core/base/inc/ROOT/TQCommand.h diff --git a/core/base/inc/TQConnection.h b/core/base/inc/ROOT/TQConnection.h similarity index 100% rename from core/base/inc/TQConnection.h rename to core/base/inc/ROOT/TQConnection.h diff --git a/core/base/inc/TQObject.h b/core/base/inc/ROOT/TQObject.h similarity index 100% rename from core/base/inc/TQObject.h rename to core/base/inc/ROOT/TQObject.h diff --git a/core/base/inc/TROOT.h b/core/base/inc/ROOT/TROOT.h similarity index 100% rename from core/base/inc/TROOT.h rename to core/base/inc/ROOT/TROOT.h diff --git a/core/base/inc/TRedirectOutputGuard.h b/core/base/inc/ROOT/TRedirectOutputGuard.h similarity index 100% rename from core/base/inc/TRedirectOutputGuard.h rename to core/base/inc/ROOT/TRedirectOutputGuard.h diff --git a/core/base/inc/TRef.h b/core/base/inc/ROOT/TRef.h similarity index 100% rename from core/base/inc/TRef.h rename to core/base/inc/ROOT/TRef.h diff --git a/core/base/inc/TRefCnt.h b/core/base/inc/ROOT/TRefCnt.h similarity index 100% rename from core/base/inc/TRefCnt.h rename to core/base/inc/ROOT/TRefCnt.h diff --git a/core/base/inc/TRegexp.h b/core/base/inc/ROOT/TRegexp.h similarity index 100% rename from core/base/inc/TRegexp.h rename to core/base/inc/ROOT/TRegexp.h diff --git a/core/base/inc/TRemoteObject.h b/core/base/inc/ROOT/TRemoteObject.h similarity index 100% rename from core/base/inc/TRemoteObject.h rename to core/base/inc/ROOT/TRemoteObject.h diff --git a/core/base/inc/TRootIOCtor.h b/core/base/inc/ROOT/TRootIOCtor.h similarity index 100% rename from core/base/inc/TRootIOCtor.h rename to core/base/inc/ROOT/TRootIOCtor.h diff --git a/core/base/inc/TStopwatch.h b/core/base/inc/ROOT/TStopwatch.h similarity index 100% rename from core/base/inc/TStopwatch.h rename to core/base/inc/ROOT/TStopwatch.h diff --git a/core/base/inc/TStorage.h b/core/base/inc/ROOT/TStorage.h similarity index 100% rename from core/base/inc/TStorage.h rename to core/base/inc/ROOT/TStorage.h diff --git a/core/base/inc/TString.h b/core/base/inc/ROOT/TString.h similarity index 100% rename from core/base/inc/TString.h rename to core/base/inc/ROOT/TString.h diff --git a/core/base/inc/TStringLong.h b/core/base/inc/ROOT/TStringLong.h similarity index 100% rename from core/base/inc/TStringLong.h rename to core/base/inc/ROOT/TStringLong.h diff --git a/core/base/inc/TStyle.h b/core/base/inc/ROOT/TStyle.h similarity index 100% rename from core/base/inc/TStyle.h rename to core/base/inc/ROOT/TStyle.h diff --git a/core/base/inc/TSysEvtHandler.h b/core/base/inc/ROOT/TSysEvtHandler.h similarity index 100% rename from core/base/inc/TSysEvtHandler.h rename to core/base/inc/ROOT/TSysEvtHandler.h diff --git a/core/base/inc/TSystem.h b/core/base/inc/ROOT/TSystem.h similarity index 100% rename from core/base/inc/TSystem.h rename to core/base/inc/ROOT/TSystem.h diff --git a/core/base/inc/TSystemDirectory.h b/core/base/inc/ROOT/TSystemDirectory.h similarity index 100% rename from core/base/inc/TSystemDirectory.h rename to core/base/inc/ROOT/TSystemDirectory.h diff --git a/core/base/inc/TSystemFile.h b/core/base/inc/ROOT/TSystemFile.h similarity index 100% rename from core/base/inc/TSystemFile.h rename to core/base/inc/ROOT/TSystemFile.h diff --git a/core/base/inc/TTask.h b/core/base/inc/ROOT/TTask.h similarity index 100% rename from core/base/inc/TTask.h rename to core/base/inc/ROOT/TTask.h diff --git a/core/base/inc/TThreadSlots.h b/core/base/inc/ROOT/TThreadSlots.h similarity index 100% rename from core/base/inc/TThreadSlots.h rename to core/base/inc/ROOT/TThreadSlots.h diff --git a/core/base/inc/TTime.h b/core/base/inc/ROOT/TTime.h similarity index 100% rename from core/base/inc/TTime.h rename to core/base/inc/ROOT/TTime.h diff --git a/core/base/inc/TTimeStamp.h b/core/base/inc/ROOT/TTimeStamp.h similarity index 100% rename from core/base/inc/TTimeStamp.h rename to core/base/inc/ROOT/TTimeStamp.h diff --git a/core/base/inc/TTimer.h b/core/base/inc/ROOT/TTimer.h similarity index 100% rename from core/base/inc/TTimer.h rename to core/base/inc/ROOT/TTimer.h diff --git a/core/base/inc/TUUID.h b/core/base/inc/ROOT/TUUID.h similarity index 100% rename from core/base/inc/TUUID.h rename to core/base/inc/ROOT/TUUID.h diff --git a/core/base/inc/TUri.h b/core/base/inc/ROOT/TUri.h similarity index 100% rename from core/base/inc/TUri.h rename to core/base/inc/ROOT/TUri.h diff --git a/core/base/inc/TUrl.h b/core/base/inc/ROOT/TUrl.h similarity index 100% rename from core/base/inc/TUrl.h rename to core/base/inc/ROOT/TUrl.h diff --git a/core/base/inc/TVersionCheck.h b/core/base/inc/ROOT/TVersionCheck.h similarity index 100% rename from core/base/inc/TVersionCheck.h rename to core/base/inc/ROOT/TVersionCheck.h diff --git a/core/base/inc/TVirtualFFT.h b/core/base/inc/ROOT/TVirtualFFT.h similarity index 100% rename from core/base/inc/TVirtualFFT.h rename to core/base/inc/ROOT/TVirtualFFT.h diff --git a/core/base/inc/TVirtualGL.h b/core/base/inc/ROOT/TVirtualGL.h similarity index 100% rename from core/base/inc/TVirtualGL.h rename to core/base/inc/ROOT/TVirtualGL.h diff --git a/core/base/inc/TVirtualMapFile.h b/core/base/inc/ROOT/TVirtualMapFile.h similarity index 100% rename from core/base/inc/TVirtualMapFile.h rename to core/base/inc/ROOT/TVirtualMapFile.h diff --git a/core/base/inc/TVirtualMonitoring.h b/core/base/inc/ROOT/TVirtualMonitoring.h similarity index 100% rename from core/base/inc/TVirtualMonitoring.h rename to core/base/inc/ROOT/TVirtualMonitoring.h diff --git a/core/base/inc/TVirtualMutex.h b/core/base/inc/ROOT/TVirtualMutex.h similarity index 100% rename from core/base/inc/TVirtualMutex.h rename to core/base/inc/ROOT/TVirtualMutex.h diff --git a/core/base/inc/TVirtualPS.h b/core/base/inc/ROOT/TVirtualPS.h similarity index 100% rename from core/base/inc/TVirtualPS.h rename to core/base/inc/ROOT/TVirtualPS.h diff --git a/core/base/inc/TVirtualPad.h b/core/base/inc/ROOT/TVirtualPad.h similarity index 100% rename from core/base/inc/TVirtualPad.h rename to core/base/inc/ROOT/TVirtualPad.h diff --git a/core/base/inc/TVirtualPadEditor.h b/core/base/inc/ROOT/TVirtualPadEditor.h similarity index 100% rename from core/base/inc/TVirtualPadEditor.h rename to core/base/inc/ROOT/TVirtualPadEditor.h diff --git a/core/base/inc/TVirtualPadPainter.h b/core/base/inc/ROOT/TVirtualPadPainter.h similarity index 100% rename from core/base/inc/TVirtualPadPainter.h rename to core/base/inc/ROOT/TVirtualPadPainter.h diff --git a/core/base/inc/TVirtualPerfStats.h b/core/base/inc/ROOT/TVirtualPerfStats.h similarity index 100% rename from core/base/inc/TVirtualPerfStats.h rename to core/base/inc/ROOT/TVirtualPerfStats.h diff --git a/core/base/inc/TVirtualQConnection.h b/core/base/inc/ROOT/TVirtualQConnection.h similarity index 100% rename from core/base/inc/TVirtualQConnection.h rename to core/base/inc/ROOT/TVirtualQConnection.h diff --git a/core/base/inc/TVirtualRWMutex.h b/core/base/inc/ROOT/TVirtualRWMutex.h similarity index 100% rename from core/base/inc/TVirtualRWMutex.h rename to core/base/inc/ROOT/TVirtualRWMutex.h diff --git a/core/base/inc/TVirtualTableInterface.h b/core/base/inc/ROOT/TVirtualTableInterface.h similarity index 100% rename from core/base/inc/TVirtualTableInterface.h rename to core/base/inc/ROOT/TVirtualTableInterface.h diff --git a/core/base/inc/TVirtualViewer3D.h b/core/base/inc/ROOT/TVirtualViewer3D.h similarity index 100% rename from core/base/inc/TVirtualViewer3D.h rename to core/base/inc/ROOT/TVirtualViewer3D.h diff --git a/core/base/inc/TVirtualX.h b/core/base/inc/ROOT/TVirtualX.h similarity index 100% rename from core/base/inc/TVirtualX.h rename to core/base/inc/ROOT/TVirtualX.h diff --git a/core/clingutils/CMakeLists.txt b/core/clingutils/CMakeLists.txt index 583983ba2121c..1f8dfc1e023ed 100644 --- a/core/clingutils/CMakeLists.txt +++ b/core/clingutils/CMakeLists.txt @@ -17,6 +17,7 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS target_include_directories(Core PUBLIC $ + $ # bw compatibility $ ) @@ -35,10 +36,15 @@ target_include_directories(ClingUtils PRIVATE ${CLING_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/core/foundation/res ${CMAKE_SOURCE_DIR}/core/foundation/inc + ${CMAKE_SOURCE_DIR}/core/foundation/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/core/base/inc + ${CMAKE_SOURCE_DIR}/core/base/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/core/clib/inc ${CMAKE_SOURCE_DIR}/core/meta/inc - ${CMAKE_BINARY_DIR}/ginclude) + ${CMAKE_SOURCE_DIR}/core/meta/inc/ROOT # bw compatibility + ${CMAKE_BINARY_DIR}/ginclude + ${CMAKE_BINARY_DIR}/ginclude/ROOT # bw compatibility + ) # Register the llvm include directories after clangs. This instructs the compiler to resolve # headers from our builtin clang. That's an issue when we are building with bultin_llvm=Off diff --git a/core/clingutils/inc/root_std_complex.h b/core/clingutils/inc/ROOT/root_std_complex.h similarity index 100% rename from core/clingutils/inc/root_std_complex.h rename to core/clingutils/inc/ROOT/root_std_complex.h diff --git a/core/cont/CMakeLists.txt b/core/cont/CMakeLists.txt index 421f8e8f0bee3..10e932000b344 100644 --- a/core/cont/CMakeLists.txt +++ b/core/cont/CMakeLists.txt @@ -10,34 +10,34 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ROOT/TSeq.hxx - TArrayC.h - TArrayD.h - TArrayF.h - TArray.h - TArrayI.h - TArrayL64.h - TArrayL.h - TArrayS.h - TBits.h - TBtree.h - TClassTable.h - TClonesArray.h - TCollection.h - TCollectionProxyInfo.h - TExMap.h - THashList.h - THashTable.h - TIterator.h - TList.h - TMap.h - TObjArray.h - TObjectTable.h - TOrdCollection.h - TRefArray.h - TRefTable.h - TSeqCollection.h - TSortedList.h - TVirtualCollectionProxy.h + ROOT/TArrayC.h + ROOT/TArrayD.h + ROOT/TArrayF.h + ROOT/TArray.h + ROOT/TArrayI.h + ROOT/TArrayL64.h + ROOT/TArrayL.h + ROOT/TArrayS.h + ROOT/TBits.h + ROOT/TBtree.h + ROOT/TClassTable.h + ROOT/TClonesArray.h + ROOT/TCollection.h + ROOT/TCollectionProxyInfo.h + ROOT/TExMap.h + ROOT/THashList.h + ROOT/THashTable.h + ROOT/TIterator.h + ROOT/TList.h + ROOT/TMap.h + ROOT/TObjArray.h + ROOT/TObjectTable.h + ROOT/TOrdCollection.h + ROOT/TRefArray.h + ROOT/TRefTable.h + ROOT/TSeqCollection.h + ROOT/TSortedList.h + ROOT/TVirtualCollectionProxy.h ) target_sources(Core PRIVATE @@ -70,7 +70,8 @@ target_sources(Core PRIVATE ) target_include_directories(Core - PUBLIC $) + PUBLIC $ + PUBLIC $) # bw compatibility ROOT_INSTALL_HEADERS() diff --git a/core/cont/inc/TArray.h b/core/cont/inc/ROOT/TArray.h similarity index 100% rename from core/cont/inc/TArray.h rename to core/cont/inc/ROOT/TArray.h diff --git a/core/cont/inc/TArrayC.h b/core/cont/inc/ROOT/TArrayC.h similarity index 100% rename from core/cont/inc/TArrayC.h rename to core/cont/inc/ROOT/TArrayC.h diff --git a/core/cont/inc/TArrayD.h b/core/cont/inc/ROOT/TArrayD.h similarity index 100% rename from core/cont/inc/TArrayD.h rename to core/cont/inc/ROOT/TArrayD.h diff --git a/core/cont/inc/TArrayF.h b/core/cont/inc/ROOT/TArrayF.h similarity index 100% rename from core/cont/inc/TArrayF.h rename to core/cont/inc/ROOT/TArrayF.h diff --git a/core/cont/inc/TArrayI.h b/core/cont/inc/ROOT/TArrayI.h similarity index 100% rename from core/cont/inc/TArrayI.h rename to core/cont/inc/ROOT/TArrayI.h diff --git a/core/cont/inc/TArrayL.h b/core/cont/inc/ROOT/TArrayL.h similarity index 100% rename from core/cont/inc/TArrayL.h rename to core/cont/inc/ROOT/TArrayL.h diff --git a/core/cont/inc/TArrayL64.h b/core/cont/inc/ROOT/TArrayL64.h similarity index 100% rename from core/cont/inc/TArrayL64.h rename to core/cont/inc/ROOT/TArrayL64.h diff --git a/core/cont/inc/TArrayS.h b/core/cont/inc/ROOT/TArrayS.h similarity index 100% rename from core/cont/inc/TArrayS.h rename to core/cont/inc/ROOT/TArrayS.h diff --git a/core/cont/inc/TBits.h b/core/cont/inc/ROOT/TBits.h similarity index 100% rename from core/cont/inc/TBits.h rename to core/cont/inc/ROOT/TBits.h diff --git a/core/cont/inc/TBtree.h b/core/cont/inc/ROOT/TBtree.h similarity index 100% rename from core/cont/inc/TBtree.h rename to core/cont/inc/ROOT/TBtree.h diff --git a/core/cont/inc/TClassTable.h b/core/cont/inc/ROOT/TClassTable.h similarity index 100% rename from core/cont/inc/TClassTable.h rename to core/cont/inc/ROOT/TClassTable.h diff --git a/core/cont/inc/TClonesArray.h b/core/cont/inc/ROOT/TClonesArray.h similarity index 100% rename from core/cont/inc/TClonesArray.h rename to core/cont/inc/ROOT/TClonesArray.h diff --git a/core/cont/inc/TCollection.h b/core/cont/inc/ROOT/TCollection.h similarity index 100% rename from core/cont/inc/TCollection.h rename to core/cont/inc/ROOT/TCollection.h diff --git a/core/cont/inc/TCollectionProxyInfo.h b/core/cont/inc/ROOT/TCollectionProxyInfo.h similarity index 100% rename from core/cont/inc/TCollectionProxyInfo.h rename to core/cont/inc/ROOT/TCollectionProxyInfo.h diff --git a/core/cont/inc/TExMap.h b/core/cont/inc/ROOT/TExMap.h similarity index 100% rename from core/cont/inc/TExMap.h rename to core/cont/inc/ROOT/TExMap.h diff --git a/core/cont/inc/THashList.h b/core/cont/inc/ROOT/THashList.h similarity index 100% rename from core/cont/inc/THashList.h rename to core/cont/inc/ROOT/THashList.h diff --git a/core/cont/inc/THashTable.h b/core/cont/inc/ROOT/THashTable.h similarity index 100% rename from core/cont/inc/THashTable.h rename to core/cont/inc/ROOT/THashTable.h diff --git a/core/cont/inc/TIterator.h b/core/cont/inc/ROOT/TIterator.h similarity index 100% rename from core/cont/inc/TIterator.h rename to core/cont/inc/ROOT/TIterator.h diff --git a/core/cont/inc/TList.h b/core/cont/inc/ROOT/TList.h similarity index 100% rename from core/cont/inc/TList.h rename to core/cont/inc/ROOT/TList.h diff --git a/core/cont/inc/TMap.h b/core/cont/inc/ROOT/TMap.h similarity index 100% rename from core/cont/inc/TMap.h rename to core/cont/inc/ROOT/TMap.h diff --git a/core/cont/inc/TObjArray.h b/core/cont/inc/ROOT/TObjArray.h similarity index 100% rename from core/cont/inc/TObjArray.h rename to core/cont/inc/ROOT/TObjArray.h diff --git a/core/cont/inc/TObjectTable.h b/core/cont/inc/ROOT/TObjectTable.h similarity index 100% rename from core/cont/inc/TObjectTable.h rename to core/cont/inc/ROOT/TObjectTable.h diff --git a/core/cont/inc/TOrdCollection.h b/core/cont/inc/ROOT/TOrdCollection.h similarity index 100% rename from core/cont/inc/TOrdCollection.h rename to core/cont/inc/ROOT/TOrdCollection.h diff --git a/core/cont/inc/TRefArray.h b/core/cont/inc/ROOT/TRefArray.h similarity index 100% rename from core/cont/inc/TRefArray.h rename to core/cont/inc/ROOT/TRefArray.h diff --git a/core/cont/inc/TRefTable.h b/core/cont/inc/ROOT/TRefTable.h similarity index 100% rename from core/cont/inc/TRefTable.h rename to core/cont/inc/ROOT/TRefTable.h diff --git a/core/cont/inc/TSeqCollection.h b/core/cont/inc/ROOT/TSeqCollection.h similarity index 100% rename from core/cont/inc/TSeqCollection.h rename to core/cont/inc/ROOT/TSeqCollection.h diff --git a/core/cont/inc/TSortedList.h b/core/cont/inc/ROOT/TSortedList.h similarity index 100% rename from core/cont/inc/TSortedList.h rename to core/cont/inc/ROOT/TSortedList.h diff --git a/core/cont/inc/TVirtualCollectionProxy.h b/core/cont/inc/ROOT/TVirtualCollectionProxy.h similarity index 100% rename from core/cont/inc/TVirtualCollectionProxy.h rename to core/cont/inc/ROOT/TVirtualCollectionProxy.h diff --git a/core/dictgen/CMakeLists.txt b/core/dictgen/CMakeLists.txt index dccbc9b297e38..2d6f2a76abc78 100644 --- a/core/dictgen/CMakeLists.txt +++ b/core/dictgen/CMakeLists.txt @@ -48,9 +48,12 @@ target_include_directories(Dictgen PRIVATE ${CMAKE_SOURCE_DIR}/core/foundation/res ${CMAKE_SOURCE_DIR}/core/clingutils/res ${CMAKE_SOURCE_DIR}/core/base/inc + ${CMAKE_SOURCE_DIR}/core/base/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/core/clib/inc ${CMAKE_SOURCE_DIR}/core/meta/inc + ${CMAKE_SOURCE_DIR}/core/meta/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/core/foundation/inc + ${CMAKE_SOURCE_DIR}/core/foundation/inc/ROOT # bw compatibility ${CMAKE_BINARY_DIR}/ginclude ${CLING_INCLUDE_DIRS} ) diff --git a/core/foundation/CMakeLists.txt b/core/foundation/CMakeLists.txt index 044b1fad1e05e..73a6cfd8dda24 100644 --- a/core/foundation/CMakeLists.txt +++ b/core/foundation/CMakeLists.txt @@ -9,9 +9,9 @@ ############################################################################ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS - ESTLType.h - TClassEdit.h - TError.h + ROOT/ESTLType.h + ROOT/TClassEdit.h + ROOT/TError.h ThreadLocalStorage.h ROOT/BitUtils.hxx ROOT/RError.hxx @@ -20,6 +20,7 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ROOT/RRangeCast.hxx ROOT/RSpan.hxx ROOT/RStringView.hxx + ROOT/RtypesCore.h ROOT/StringUtils.hxx ROOT/span.hxx ROOT/TypeTraits.hxx @@ -35,13 +36,16 @@ set(FOUNDATION_SOURCES src/TError.cxx ) -set(FOUNDATION_HEADER_DIRS inc/) +set(FOUNDATION_HEADER_DIRS inc/ +inc/ROOT/ # bw compatibility +) target_sources(Core PRIVATE ${FOUNDATION_SOURCES}) target_include_directories(Core PUBLIC $ + $ # bw compatibility PRIVATE res ) @@ -51,6 +55,7 @@ ROOT_OBJECT_LIBRARY(Foundation_Stage1 ${FOUNDATION_SOURCES}) # used by rootcling target_include_directories(Foundation_Stage1 PUBLIC $ + $ # bw compatibility PRIVATE $<$:${CMAKE_SOURCE_DIR}/core/winnt/inc> ${CMAKE_BINARY_DIR}/ginclude res diff --git a/core/foundation/inc/DllImport.h b/core/foundation/inc/ROOT/DllImport.h similarity index 100% rename from core/foundation/inc/DllImport.h rename to core/foundation/inc/ROOT/DllImport.h diff --git a/core/foundation/inc/ESTLType.h b/core/foundation/inc/ROOT/ESTLType.h similarity index 100% rename from core/foundation/inc/ESTLType.h rename to core/foundation/inc/ROOT/ESTLType.h diff --git a/core/foundation/inc/RtypesCore.h b/core/foundation/inc/ROOT/RtypesCore.h similarity index 100% rename from core/foundation/inc/RtypesCore.h rename to core/foundation/inc/ROOT/RtypesCore.h diff --git a/core/foundation/inc/TClassEdit.h b/core/foundation/inc/ROOT/TClassEdit.h similarity index 100% rename from core/foundation/inc/TClassEdit.h rename to core/foundation/inc/ROOT/TClassEdit.h diff --git a/core/foundation/inc/TError.h b/core/foundation/inc/ROOT/TError.h similarity index 100% rename from core/foundation/inc/TError.h rename to core/foundation/inc/ROOT/TError.h diff --git a/core/gui/CMakeLists.txt b/core/gui/CMakeLists.txt index b51d25f3a6046..b8a0c72a72b44 100644 --- a/core/gui/CMakeLists.txt +++ b/core/gui/CMakeLists.txt @@ -9,20 +9,20 @@ ############################################################################ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS - GuiTypes.h - TApplicationImp.h - TBrowser.h - TBrowserImp.h - TCanvasImp.h - TClassMenuItem.h - TContextMenu.h - TContextMenuImp.h - TControlBarImp.h - TGuiFactory.h - TInspectorImp.h - TObjectSpy.h - TToggleGroup.h - TToggle.h + ROOT/GuiTypes.h + ROOT/TApplicationImp.h + ROOT/TBrowser.h + ROOT/TBrowserImp.h + ROOT/TCanvasImp.h + ROOT/TClassMenuItem.h + ROOT/TContextMenu.h + ROOT/TContextMenuImp.h + ROOT/TControlBarImp.h + ROOT/TGuiFactory.h + ROOT/TInspectorImp.h + ROOT/TObjectSpy.h + ROOT/TToggleGroup.h + ROOT/TToggle.h ) target_sources(Core PRIVATE @@ -44,6 +44,7 @@ target_sources(Core PRIVATE target_include_directories(Core PUBLIC $ + $ # bw compatibility ) ROOT_INSTALL_HEADERS() diff --git a/core/gui/inc/GuiTypes.h b/core/gui/inc/ROOT/GuiTypes.h similarity index 100% rename from core/gui/inc/GuiTypes.h rename to core/gui/inc/ROOT/GuiTypes.h diff --git a/core/gui/inc/TApplicationImp.h b/core/gui/inc/ROOT/TApplicationImp.h similarity index 100% rename from core/gui/inc/TApplicationImp.h rename to core/gui/inc/ROOT/TApplicationImp.h diff --git a/core/gui/inc/TBrowser.h b/core/gui/inc/ROOT/TBrowser.h similarity index 100% rename from core/gui/inc/TBrowser.h rename to core/gui/inc/ROOT/TBrowser.h diff --git a/core/gui/inc/TBrowserImp.h b/core/gui/inc/ROOT/TBrowserImp.h similarity index 100% rename from core/gui/inc/TBrowserImp.h rename to core/gui/inc/ROOT/TBrowserImp.h diff --git a/core/gui/inc/TCanvasImp.h b/core/gui/inc/ROOT/TCanvasImp.h similarity index 100% rename from core/gui/inc/TCanvasImp.h rename to core/gui/inc/ROOT/TCanvasImp.h diff --git a/core/gui/inc/TClassMenuItem.h b/core/gui/inc/ROOT/TClassMenuItem.h similarity index 100% rename from core/gui/inc/TClassMenuItem.h rename to core/gui/inc/ROOT/TClassMenuItem.h diff --git a/core/gui/inc/TContextMenu.h b/core/gui/inc/ROOT/TContextMenu.h similarity index 100% rename from core/gui/inc/TContextMenu.h rename to core/gui/inc/ROOT/TContextMenu.h diff --git a/core/gui/inc/TContextMenuImp.h b/core/gui/inc/ROOT/TContextMenuImp.h similarity index 100% rename from core/gui/inc/TContextMenuImp.h rename to core/gui/inc/ROOT/TContextMenuImp.h diff --git a/core/gui/inc/TControlBarImp.h b/core/gui/inc/ROOT/TControlBarImp.h similarity index 100% rename from core/gui/inc/TControlBarImp.h rename to core/gui/inc/ROOT/TControlBarImp.h diff --git a/core/gui/inc/TGuiFactory.h b/core/gui/inc/ROOT/TGuiFactory.h similarity index 100% rename from core/gui/inc/TGuiFactory.h rename to core/gui/inc/ROOT/TGuiFactory.h diff --git a/core/gui/inc/TInspectorImp.h b/core/gui/inc/ROOT/TInspectorImp.h similarity index 100% rename from core/gui/inc/TInspectorImp.h rename to core/gui/inc/ROOT/TInspectorImp.h diff --git a/core/gui/inc/TObjectSpy.h b/core/gui/inc/ROOT/TObjectSpy.h similarity index 100% rename from core/gui/inc/TObjectSpy.h rename to core/gui/inc/ROOT/TObjectSpy.h diff --git a/core/gui/inc/TToggle.h b/core/gui/inc/ROOT/TToggle.h similarity index 100% rename from core/gui/inc/TToggle.h rename to core/gui/inc/ROOT/TToggle.h diff --git a/core/gui/inc/TToggleGroup.h b/core/gui/inc/ROOT/TToggleGroup.h similarity index 100% rename from core/gui/inc/TToggleGroup.h rename to core/gui/inc/ROOT/TToggleGroup.h diff --git a/core/macosx/CMakeLists.txt b/core/macosx/CMakeLists.txt index e3e38e959316f..ac729aed22fcb 100644 --- a/core/macosx/CMakeLists.txt +++ b/core/macosx/CMakeLists.txt @@ -18,9 +18,11 @@ target_link_libraries(Core PRIVATE ) if(cocoa) - set_property(TARGET Core APPEND PROPERTY DICT_HEADERS TMacOSXSystem.h) + set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ROOT/TMacOSXSystem.h) - target_include_directories(Core PRIVATE inc) + target_include_directories(Core PRIVATE inc + inc/ROOT # bw compatibility + ) find_library(COCOA_FRAMEWORK Cocoa REQUIRED) target_link_libraries(Core PRIVATE ${COCOA_FRAMEWORK}) @@ -31,7 +33,9 @@ if(cocoa) ) target_compile_options(Macosx PRIVATE -ObjC++) - target_include_directories(Macosx PRIVATE ../unix/inc) + target_include_directories(Macosx PRIVATE ../unix/inc/ + ../unix/inc/ROOT # bw compatibility + ) target_sources(Core PRIVATE $) diff --git a/core/macosx/inc/CocoaUtils.h b/core/macosx/inc/ROOT/CocoaUtils.h similarity index 100% rename from core/macosx/inc/CocoaUtils.h rename to core/macosx/inc/ROOT/CocoaUtils.h diff --git a/core/macosx/inc/TMacOSXSystem.h b/core/macosx/inc/ROOT/TMacOSXSystem.h similarity index 100% rename from core/macosx/inc/TMacOSXSystem.h rename to core/macosx/inc/ROOT/TMacOSXSystem.h diff --git a/core/meta/CMakeLists.txt b/core/meta/CMakeLists.txt index 8e010343a9a34..05df8a57a326c 100644 --- a/core/meta/CMakeLists.txt +++ b/core/meta/CMakeLists.txt @@ -9,47 +9,47 @@ ############################################################################ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS - TBaseClass.h - TClassGenerator.h - TClass.h - TClassRef.h - TClassStreamer.h - TDataMember.h - TDataType.h - TDictAttributeMap.h - TDictionary.h - TEnumConstant.h - TEnum.h - TFileMergeInfo.h - TFunction.h - TFunctionTemplate.h - TGenericClassInfo.h - TGlobal.h - TInterpreter.h - TInterpreterValue.h - TIsAProxy.h - TListOfDataMembers.h - TListOfEnums.h - TListOfEnumsWithLock.h - TListOfFunctions.h - TListOfFunctionTemplates.h - TMemberStreamer.h - TMethodArg.h - TMethodCall.h - TMethod.h - TProtoClass.h - TRealData.h - TSchemaHelper.h - TSchemaRule.h - TSchemaRuleSet.h - TStatusBitsChecker.h - TStreamerElement.h - TStreamer.h - TVirtualIsAProxy.h - TVirtualRefProxy.h - TVirtualStreamerInfo.h - TVirtualArray.h - TVirtualObject.h + ROOT/TBaseClass.h + ROOT/TClassGenerator.h + ROOT/TClass.h + ROOT/TClassRef.h + ROOT/TClassStreamer.h + ROOT/TDataMember.h + ROOT/TDataType.h + ROOT/TDictAttributeMap.h + ROOT/TDictionary.h + ROOT/TEnumConstant.h + ROOT/TEnum.h + ROOT/TFileMergeInfo.h + ROOT/TFunction.h + ROOT/TFunctionTemplate.h + ROOT/TGenericClassInfo.h + ROOT/TGlobal.h + ROOT/TInterpreter.h + ROOT/TInterpreterValue.h + ROOT/TIsAProxy.h + ROOT/TListOfDataMembers.h + ROOT/TListOfEnums.h + ROOT/TListOfEnumsWithLock.h + ROOT/TListOfFunctions.h + ROOT/TListOfFunctionTemplates.h + ROOT/TMemberStreamer.h + ROOT/TMethodArg.h + ROOT/TMethodCall.h + ROOT/TMethod.h + ROOT/TProtoClass.h + ROOT/TRealData.h + ROOT/TSchemaHelper.h + ROOT/TSchemaRule.h + ROOT/TSchemaRuleSet.h + ROOT/TStatusBitsChecker.h + ROOT/TStreamerElement.h + ROOT/TStreamer.h + ROOT/TVirtualIsAProxy.h + ROOT/TVirtualRefProxy.h + ROOT/TVirtualStreamerInfo.h + ROOT/TVirtualArray.h + ROOT/TVirtualObject.h ) target_sources(Core PRIVATE @@ -91,6 +91,7 @@ target_sources(Core PRIVATE target_include_directories(Core PUBLIC $ + $ # bw compatibility ) ROOT_INSTALL_HEADERS() diff --git a/core/meta/inc/RootMetaSelection.h b/core/meta/inc/ROOT/RootMetaSelection.h similarity index 100% rename from core/meta/inc/RootMetaSelection.h rename to core/meta/inc/ROOT/RootMetaSelection.h diff --git a/core/meta/inc/TBaseClass.h b/core/meta/inc/ROOT/TBaseClass.h similarity index 100% rename from core/meta/inc/TBaseClass.h rename to core/meta/inc/ROOT/TBaseClass.h diff --git a/core/meta/inc/TClass.h b/core/meta/inc/ROOT/TClass.h similarity index 100% rename from core/meta/inc/TClass.h rename to core/meta/inc/ROOT/TClass.h diff --git a/core/meta/inc/TClassGenerator.h b/core/meta/inc/ROOT/TClassGenerator.h similarity index 100% rename from core/meta/inc/TClassGenerator.h rename to core/meta/inc/ROOT/TClassGenerator.h diff --git a/core/meta/inc/TClassRef.h b/core/meta/inc/ROOT/TClassRef.h similarity index 100% rename from core/meta/inc/TClassRef.h rename to core/meta/inc/ROOT/TClassRef.h diff --git a/core/meta/inc/TClassStreamer.h b/core/meta/inc/ROOT/TClassStreamer.h similarity index 100% rename from core/meta/inc/TClassStreamer.h rename to core/meta/inc/ROOT/TClassStreamer.h diff --git a/core/meta/inc/TDataMember.h b/core/meta/inc/ROOT/TDataMember.h similarity index 100% rename from core/meta/inc/TDataMember.h rename to core/meta/inc/ROOT/TDataMember.h diff --git a/core/meta/inc/TDataType.h b/core/meta/inc/ROOT/TDataType.h similarity index 100% rename from core/meta/inc/TDataType.h rename to core/meta/inc/ROOT/TDataType.h diff --git a/core/meta/inc/TDictAttributeMap.h b/core/meta/inc/ROOT/TDictAttributeMap.h similarity index 100% rename from core/meta/inc/TDictAttributeMap.h rename to core/meta/inc/ROOT/TDictAttributeMap.h diff --git a/core/meta/inc/TDictionary.h b/core/meta/inc/ROOT/TDictionary.h similarity index 100% rename from core/meta/inc/TDictionary.h rename to core/meta/inc/ROOT/TDictionary.h diff --git a/core/meta/inc/TEnum.h b/core/meta/inc/ROOT/TEnum.h similarity index 100% rename from core/meta/inc/TEnum.h rename to core/meta/inc/ROOT/TEnum.h diff --git a/core/meta/inc/TEnumConstant.h b/core/meta/inc/ROOT/TEnumConstant.h similarity index 100% rename from core/meta/inc/TEnumConstant.h rename to core/meta/inc/ROOT/TEnumConstant.h diff --git a/core/meta/inc/TFileMergeInfo.h b/core/meta/inc/ROOT/TFileMergeInfo.h similarity index 100% rename from core/meta/inc/TFileMergeInfo.h rename to core/meta/inc/ROOT/TFileMergeInfo.h diff --git a/core/meta/inc/TFunction.h b/core/meta/inc/ROOT/TFunction.h similarity index 100% rename from core/meta/inc/TFunction.h rename to core/meta/inc/ROOT/TFunction.h diff --git a/core/meta/inc/TFunctionTemplate.h b/core/meta/inc/ROOT/TFunctionTemplate.h similarity index 100% rename from core/meta/inc/TFunctionTemplate.h rename to core/meta/inc/ROOT/TFunctionTemplate.h diff --git a/core/meta/inc/TGenericClassInfo.h b/core/meta/inc/ROOT/TGenericClassInfo.h similarity index 100% rename from core/meta/inc/TGenericClassInfo.h rename to core/meta/inc/ROOT/TGenericClassInfo.h diff --git a/core/meta/inc/TGlobal.h b/core/meta/inc/ROOT/TGlobal.h similarity index 100% rename from core/meta/inc/TGlobal.h rename to core/meta/inc/ROOT/TGlobal.h diff --git a/core/meta/inc/TInterpreter.h b/core/meta/inc/ROOT/TInterpreter.h similarity index 100% rename from core/meta/inc/TInterpreter.h rename to core/meta/inc/ROOT/TInterpreter.h diff --git a/core/meta/inc/TInterpreterValue.h b/core/meta/inc/ROOT/TInterpreterValue.h similarity index 100% rename from core/meta/inc/TInterpreterValue.h rename to core/meta/inc/ROOT/TInterpreterValue.h diff --git a/core/meta/inc/TIsAProxy.h b/core/meta/inc/ROOT/TIsAProxy.h similarity index 100% rename from core/meta/inc/TIsAProxy.h rename to core/meta/inc/ROOT/TIsAProxy.h diff --git a/core/meta/inc/TListOfDataMembers.h b/core/meta/inc/ROOT/TListOfDataMembers.h similarity index 100% rename from core/meta/inc/TListOfDataMembers.h rename to core/meta/inc/ROOT/TListOfDataMembers.h diff --git a/core/meta/inc/TListOfEnums.h b/core/meta/inc/ROOT/TListOfEnums.h similarity index 100% rename from core/meta/inc/TListOfEnums.h rename to core/meta/inc/ROOT/TListOfEnums.h diff --git a/core/meta/inc/TListOfEnumsWithLock.h b/core/meta/inc/ROOT/TListOfEnumsWithLock.h similarity index 100% rename from core/meta/inc/TListOfEnumsWithLock.h rename to core/meta/inc/ROOT/TListOfEnumsWithLock.h diff --git a/core/meta/inc/TListOfFunctionTemplates.h b/core/meta/inc/ROOT/TListOfFunctionTemplates.h similarity index 100% rename from core/meta/inc/TListOfFunctionTemplates.h rename to core/meta/inc/ROOT/TListOfFunctionTemplates.h diff --git a/core/meta/inc/TListOfFunctions.h b/core/meta/inc/ROOT/TListOfFunctions.h similarity index 100% rename from core/meta/inc/TListOfFunctions.h rename to core/meta/inc/ROOT/TListOfFunctions.h diff --git a/core/meta/inc/TMemberStreamer.h b/core/meta/inc/ROOT/TMemberStreamer.h similarity index 100% rename from core/meta/inc/TMemberStreamer.h rename to core/meta/inc/ROOT/TMemberStreamer.h diff --git a/core/meta/inc/TMethod.h b/core/meta/inc/ROOT/TMethod.h similarity index 100% rename from core/meta/inc/TMethod.h rename to core/meta/inc/ROOT/TMethod.h diff --git a/core/meta/inc/TMethodArg.h b/core/meta/inc/ROOT/TMethodArg.h similarity index 100% rename from core/meta/inc/TMethodArg.h rename to core/meta/inc/ROOT/TMethodArg.h diff --git a/core/meta/inc/TMethodCall.h b/core/meta/inc/ROOT/TMethodCall.h similarity index 100% rename from core/meta/inc/TMethodCall.h rename to core/meta/inc/ROOT/TMethodCall.h diff --git a/core/meta/inc/TProtoClass.h b/core/meta/inc/ROOT/TProtoClass.h similarity index 100% rename from core/meta/inc/TProtoClass.h rename to core/meta/inc/ROOT/TProtoClass.h diff --git a/core/meta/inc/TRealData.h b/core/meta/inc/ROOT/TRealData.h similarity index 100% rename from core/meta/inc/TRealData.h rename to core/meta/inc/ROOT/TRealData.h diff --git a/core/meta/inc/TSchemaHelper.h b/core/meta/inc/ROOT/TSchemaHelper.h similarity index 100% rename from core/meta/inc/TSchemaHelper.h rename to core/meta/inc/ROOT/TSchemaHelper.h diff --git a/core/meta/inc/TSchemaRule.h b/core/meta/inc/ROOT/TSchemaRule.h similarity index 100% rename from core/meta/inc/TSchemaRule.h rename to core/meta/inc/ROOT/TSchemaRule.h diff --git a/core/meta/inc/TSchemaRuleSet.h b/core/meta/inc/ROOT/TSchemaRuleSet.h similarity index 100% rename from core/meta/inc/TSchemaRuleSet.h rename to core/meta/inc/ROOT/TSchemaRuleSet.h diff --git a/core/meta/inc/TStatusBitsChecker.h b/core/meta/inc/ROOT/TStatusBitsChecker.h similarity index 100% rename from core/meta/inc/TStatusBitsChecker.h rename to core/meta/inc/ROOT/TStatusBitsChecker.h diff --git a/core/meta/inc/TStreamer.h b/core/meta/inc/ROOT/TStreamer.h similarity index 100% rename from core/meta/inc/TStreamer.h rename to core/meta/inc/ROOT/TStreamer.h diff --git a/core/meta/inc/TStreamerElement.h b/core/meta/inc/ROOT/TStreamerElement.h similarity index 100% rename from core/meta/inc/TStreamerElement.h rename to core/meta/inc/ROOT/TStreamerElement.h diff --git a/core/meta/inc/TVirtualArray.h b/core/meta/inc/ROOT/TVirtualArray.h similarity index 100% rename from core/meta/inc/TVirtualArray.h rename to core/meta/inc/ROOT/TVirtualArray.h diff --git a/core/meta/inc/TVirtualIsAProxy.h b/core/meta/inc/ROOT/TVirtualIsAProxy.h similarity index 100% rename from core/meta/inc/TVirtualIsAProxy.h rename to core/meta/inc/ROOT/TVirtualIsAProxy.h diff --git a/core/meta/inc/TVirtualObject.h b/core/meta/inc/ROOT/TVirtualObject.h similarity index 100% rename from core/meta/inc/TVirtualObject.h rename to core/meta/inc/ROOT/TVirtualObject.h diff --git a/core/meta/inc/TVirtualRefProxy.h b/core/meta/inc/ROOT/TVirtualRefProxy.h similarity index 100% rename from core/meta/inc/TVirtualRefProxy.h rename to core/meta/inc/ROOT/TVirtualRefProxy.h diff --git a/core/meta/inc/TVirtualStreamerInfo.h b/core/meta/inc/ROOT/TVirtualStreamerInfo.h similarity index 100% rename from core/meta/inc/TVirtualStreamerInfo.h rename to core/meta/inc/ROOT/TVirtualStreamerInfo.h diff --git a/core/metacling/src/CMakeLists.txt b/core/metacling/src/CMakeLists.txt index ce830802a9b21..a74d236d9b376 100644 --- a/core/metacling/src/CMakeLists.txt +++ b/core/metacling/src/CMakeLists.txt @@ -56,15 +56,20 @@ target_include_directories(MetaCling SYSTEM PRIVATE target_include_directories(MetaCling PRIVATE ${CLING_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/core/base/inc + ${CMAKE_SOURCE_DIR}/core/base/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/core/clib/inc ${CMAKE_SOURCE_DIR}/core/clingutils/res ${CMAKE_SOURCE_DIR}/core/cont/inc ${CMAKE_SOURCE_DIR}/core/foundation/inc + ${CMAKE_SOURCE_DIR}/core/cont/inc/ROOT # bw compatibility + ${CMAKE_SOURCE_DIR}/core/foundation/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/core/foundation/res ${CMAKE_SOURCE_DIR}/core/meta/inc ${CMAKE_SOURCE_DIR}/core/metacling/res ${CMAKE_SOURCE_DIR}/core/thread/inc ${CMAKE_SOURCE_DIR}/core/zip/inc + ${CMAKE_SOURCE_DIR}/core/thread/inc/ROOT # bw compatibility + ${CMAKE_SOURCE_DIR}/core/zip/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/io/io/inc ${CMAKE_BINARY_DIR}/ginclude ) diff --git a/core/multiproc/CMakeLists.txt b/core/multiproc/CMakeLists.txt index b506d8de530e4..a11b360534973 100644 --- a/core/multiproc/CMakeLists.txt +++ b/core/multiproc/CMakeLists.txt @@ -14,13 +14,13 @@ endif() ROOT_STANDARD_LIBRARY_PACKAGE(MultiProc STAGE1 HEADERS - MPCode.h - MPSendRecv.h - PoolUtils.h - TMPClient.h - TMPWorker.h - TMPWorkerExecutor.h - TProcPool.h + ROOT/MPCode.h + ROOT/MPSendRecv.h + ROOT/PoolUtils.h + ROOT/TMPClient.h + ROOT/TMPWorker.h + ROOT/TMPWorkerExecutor.h + ROOT/TProcPool.h ROOT/TProcessExecutor.hxx SOURCES src/MPSendRecv.cxx diff --git a/core/multiproc/inc/MPCode.h b/core/multiproc/inc/ROOT/MPCode.h similarity index 100% rename from core/multiproc/inc/MPCode.h rename to core/multiproc/inc/ROOT/MPCode.h diff --git a/core/multiproc/inc/MPSendRecv.h b/core/multiproc/inc/ROOT/MPSendRecv.h similarity index 100% rename from core/multiproc/inc/MPSendRecv.h rename to core/multiproc/inc/ROOT/MPSendRecv.h diff --git a/core/multiproc/inc/PoolUtils.h b/core/multiproc/inc/ROOT/PoolUtils.h similarity index 100% rename from core/multiproc/inc/PoolUtils.h rename to core/multiproc/inc/ROOT/PoolUtils.h diff --git a/core/multiproc/inc/TMPClient.h b/core/multiproc/inc/ROOT/TMPClient.h similarity index 100% rename from core/multiproc/inc/TMPClient.h rename to core/multiproc/inc/ROOT/TMPClient.h diff --git a/core/multiproc/inc/TMPWorker.h b/core/multiproc/inc/ROOT/TMPWorker.h similarity index 100% rename from core/multiproc/inc/TMPWorker.h rename to core/multiproc/inc/ROOT/TMPWorker.h diff --git a/core/multiproc/inc/TMPWorkerExecutor.h b/core/multiproc/inc/ROOT/TMPWorkerExecutor.h similarity index 100% rename from core/multiproc/inc/TMPWorkerExecutor.h rename to core/multiproc/inc/ROOT/TMPWorkerExecutor.h diff --git a/core/multiproc/inc/TProcPool.h b/core/multiproc/inc/ROOT/TProcPool.h similarity index 100% rename from core/multiproc/inc/TProcPool.h rename to core/multiproc/inc/ROOT/TProcPool.h diff --git a/core/rint/CMakeLists.txt b/core/rint/CMakeLists.txt index 80e9aea0e0fe6..907afc86620c5 100644 --- a/core/rint/CMakeLists.txt +++ b/core/rint/CMakeLists.txt @@ -11,8 +11,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Rint STAGE1 HEADERS - TRint.h - TTabCom.h + ROOT/TRint.h + ROOT/TTabCom.h SOURCES src/TRint.cxx src/TTabCom.cxx @@ -22,6 +22,8 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Rint Core ) -target_include_directories(Core PRIVATE inc) +target_include_directories(Core PRIVATE inc +inc/ROOT # bw compatibility +) ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/core/rint/inc/TRint.h b/core/rint/inc/ROOT/TRint.h similarity index 100% rename from core/rint/inc/TRint.h rename to core/rint/inc/ROOT/TRint.h diff --git a/core/rint/inc/TTabCom.h b/core/rint/inc/ROOT/TTabCom.h similarity index 100% rename from core/rint/inc/TTabCom.h rename to core/rint/inc/ROOT/TTabCom.h diff --git a/core/textinput/CMakeLists.txt b/core/textinput/CMakeLists.txt index e1e8f487e070f..0fc9ffcddff54 100644 --- a/core/textinput/CMakeLists.txt +++ b/core/textinput/CMakeLists.txt @@ -33,6 +33,7 @@ target_sources(Core PRIVATE target_include_directories(Core PUBLIC $ + $ # bw compatibility PRIVATE src ) diff --git a/core/textinput/inc/Getline.h b/core/textinput/inc/ROOT/Getline.h similarity index 100% rename from core/textinput/inc/Getline.h rename to core/textinput/inc/ROOT/Getline.h diff --git a/core/thread/CMakeLists.txt b/core/thread/CMakeLists.txt index 83133efce59a4..1bd700ecbd9ea 100644 --- a/core/thread/CMakeLists.txt +++ b/core/thread/CMakeLists.txt @@ -11,18 +11,18 @@ if(WIN32) set(PLATFORM_FILTER FILTER "Posix") set(PLATFORM_HEADERS - TWin32Condition.h - TWin32Mutex.h - TWin32Thread.h - TWin32ThreadFactory.h + ROOT/TWin32Condition.h + ROOT/TWin32Mutex.h + ROOT/TWin32Thread.h + ROOT/TWin32ThreadFactory.h ) else() set(PLATFORM_FILTER FILTER "Win32") set(PLATFORM_HEADERS - TPosixCondition.h - TPosixMutex.h - TPosixThread.h - TPosixThreadFactory.h + ROOT/TPosixCondition.h + ROOT/TPosixMutex.h + ROOT/TPosixThread.h + ROOT/TPosixThreadFactory.h PosixThreadInc.h ) endif() @@ -30,17 +30,17 @@ endif() ROOT_STANDARD_LIBRARY_PACKAGE(Thread HEADERS ${PLATFORM_HEADERS} - TAtomicCount.h - TCondition.h - TConditionImp.h - TMutex.h - TMutexImp.h - TRWLock.h - TSemaphore.h - TThreadFactory.h - TThread.h - TThreadImp.h - TThreadPool.h + ROOT/TAtomicCount.h + ROOT/TCondition.h + ROOT/TConditionImp.h + ROOT/TMutex.h + ROOT/TMutexImp.h + ROOT/TRWLock.h + ROOT/TSemaphore.h + ROOT/TThreadFactory.h + ROOT/TThread.h + ROOT/TThreadImp.h + ROOT/TThreadPool.h ROOT/TRWSpinLock.hxx ROOT/TSpinMutex.hxx ROOT/TThreadedObject.hxx @@ -67,12 +67,14 @@ ROOT_STANDARD_LIBRARY_PACKAGE(Thread target_include_directories(Core PUBLIC $ + $ # bw compatibility ) target_link_libraries(Thread PUBLIC ${CMAKE_THREAD_LIBS_INIT}) target_include_directories(Thread PUBLIC $ + $ # bw compatibility ) if(TARGET TBB::tbb) diff --git a/core/thread/inc/TAtomicCount.h b/core/thread/inc/ROOT/TAtomicCount.h similarity index 100% rename from core/thread/inc/TAtomicCount.h rename to core/thread/inc/ROOT/TAtomicCount.h diff --git a/core/thread/inc/TAtomicCountGcc.h b/core/thread/inc/ROOT/TAtomicCountGcc.h similarity index 100% rename from core/thread/inc/TAtomicCountGcc.h rename to core/thread/inc/ROOT/TAtomicCountGcc.h diff --git a/core/thread/inc/TAtomicCountPthread.h b/core/thread/inc/ROOT/TAtomicCountPthread.h similarity index 100% rename from core/thread/inc/TAtomicCountPthread.h rename to core/thread/inc/ROOT/TAtomicCountPthread.h diff --git a/core/thread/inc/TCondition.h b/core/thread/inc/ROOT/TCondition.h similarity index 100% rename from core/thread/inc/TCondition.h rename to core/thread/inc/ROOT/TCondition.h diff --git a/core/thread/inc/TConditionImp.h b/core/thread/inc/ROOT/TConditionImp.h similarity index 100% rename from core/thread/inc/TConditionImp.h rename to core/thread/inc/ROOT/TConditionImp.h diff --git a/core/thread/inc/TMutex.h b/core/thread/inc/ROOT/TMutex.h similarity index 100% rename from core/thread/inc/TMutex.h rename to core/thread/inc/ROOT/TMutex.h diff --git a/core/thread/inc/TMutexImp.h b/core/thread/inc/ROOT/TMutexImp.h similarity index 100% rename from core/thread/inc/TMutexImp.h rename to core/thread/inc/ROOT/TMutexImp.h diff --git a/core/thread/inc/TPosixCondition.h b/core/thread/inc/ROOT/TPosixCondition.h similarity index 100% rename from core/thread/inc/TPosixCondition.h rename to core/thread/inc/ROOT/TPosixCondition.h diff --git a/core/thread/inc/TPosixMutex.h b/core/thread/inc/ROOT/TPosixMutex.h similarity index 100% rename from core/thread/inc/TPosixMutex.h rename to core/thread/inc/ROOT/TPosixMutex.h diff --git a/core/thread/inc/TPosixThread.h b/core/thread/inc/ROOT/TPosixThread.h similarity index 100% rename from core/thread/inc/TPosixThread.h rename to core/thread/inc/ROOT/TPosixThread.h diff --git a/core/thread/inc/TPosixThreadFactory.h b/core/thread/inc/ROOT/TPosixThreadFactory.h similarity index 100% rename from core/thread/inc/TPosixThreadFactory.h rename to core/thread/inc/ROOT/TPosixThreadFactory.h diff --git a/core/thread/inc/TRWLock.h b/core/thread/inc/ROOT/TRWLock.h similarity index 100% rename from core/thread/inc/TRWLock.h rename to core/thread/inc/ROOT/TRWLock.h diff --git a/core/thread/inc/TSemaphore.h b/core/thread/inc/ROOT/TSemaphore.h similarity index 100% rename from core/thread/inc/TSemaphore.h rename to core/thread/inc/ROOT/TSemaphore.h diff --git a/core/thread/inc/TThread.h b/core/thread/inc/ROOT/TThread.h similarity index 100% rename from core/thread/inc/TThread.h rename to core/thread/inc/ROOT/TThread.h diff --git a/core/thread/inc/TThreadFactory.h b/core/thread/inc/ROOT/TThreadFactory.h similarity index 100% rename from core/thread/inc/TThreadFactory.h rename to core/thread/inc/ROOT/TThreadFactory.h diff --git a/core/thread/inc/TThreadImp.h b/core/thread/inc/ROOT/TThreadImp.h similarity index 100% rename from core/thread/inc/TThreadImp.h rename to core/thread/inc/ROOT/TThreadImp.h diff --git a/core/thread/inc/TThreadPool.h b/core/thread/inc/ROOT/TThreadPool.h similarity index 100% rename from core/thread/inc/TThreadPool.h rename to core/thread/inc/ROOT/TThreadPool.h diff --git a/core/thread/inc/TWin32AtomicCount.h b/core/thread/inc/ROOT/TWin32AtomicCount.h similarity index 100% rename from core/thread/inc/TWin32AtomicCount.h rename to core/thread/inc/ROOT/TWin32AtomicCount.h diff --git a/core/thread/inc/TWin32Condition.h b/core/thread/inc/ROOT/TWin32Condition.h similarity index 100% rename from core/thread/inc/TWin32Condition.h rename to core/thread/inc/ROOT/TWin32Condition.h diff --git a/core/thread/inc/TWin32Mutex.h b/core/thread/inc/ROOT/TWin32Mutex.h similarity index 100% rename from core/thread/inc/TWin32Mutex.h rename to core/thread/inc/ROOT/TWin32Mutex.h diff --git a/core/thread/inc/TWin32Thread.h b/core/thread/inc/ROOT/TWin32Thread.h similarity index 100% rename from core/thread/inc/TWin32Thread.h rename to core/thread/inc/ROOT/TWin32Thread.h diff --git a/core/thread/inc/TWin32ThreadFactory.h b/core/thread/inc/ROOT/TWin32ThreadFactory.h similarity index 100% rename from core/thread/inc/TWin32ThreadFactory.h rename to core/thread/inc/ROOT/TWin32ThreadFactory.h diff --git a/core/unix/CMakeLists.txt b/core/unix/CMakeLists.txt index f1bfed48174af..4f4e7316bce55 100644 --- a/core/unix/CMakeLists.txt +++ b/core/unix/CMakeLists.txt @@ -12,9 +12,11 @@ if(NOT UNIX) return() endif() -set_property(TARGET Core APPEND PROPERTY DICT_HEADERS TUnixSystem.h) +set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ROOT/TUnixSystem.h) target_sources(Core PRIVATE src/TUnixSystem.cxx) -target_include_directories(Core PRIVATE inc ../clib/res) +target_include_directories(Core PRIVATE inc/ ../clib/res +inc/ROOT # bw compatibility +) if (CMAKE_SYSTEM_NAME MATCHES FreeBSD) target_link_libraries(Core PRIVATE execinfo util) diff --git a/core/unix/inc/TUnixSystem.h b/core/unix/inc/ROOT/TUnixSystem.h similarity index 100% rename from core/unix/inc/TUnixSystem.h rename to core/unix/inc/ROOT/TUnixSystem.h diff --git a/core/winnt/CMakeLists.txt b/core/winnt/CMakeLists.txt index e5810ab8ecb4a..c6af70fd68b2d 100644 --- a/core/winnt/CMakeLists.txt +++ b/core/winnt/CMakeLists.txt @@ -12,7 +12,7 @@ if(NOT WIN32) return() endif() -set_property(TARGET Core APPEND PROPERTY DICT_HEADERS TWinNTSystem.h) +set_property(TARGET Core APPEND PROPERTY DICT_HEADERS ROOT/TWinNTSystem.h) target_sources(Core PRIVATE src/TWin32SplashThread.cxx @@ -28,6 +28,8 @@ target_link_libraries(Core PRIVATE Bcrypt.lib ) -target_include_directories(Core PRIVATE inc) +target_include_directories(Core PRIVATE inc +inc/ROOT # bw compatibility +) ROOT_INSTALL_HEADERS() diff --git a/core/winnt/inc/TWin32SplashThread.h b/core/winnt/inc/ROOT/TWin32SplashThread.h similarity index 100% rename from core/winnt/inc/TWin32SplashThread.h rename to core/winnt/inc/ROOT/TWin32SplashThread.h diff --git a/core/winnt/inc/TWinNTSystem.h b/core/winnt/inc/ROOT/TWinNTSystem.h similarity index 100% rename from core/winnt/inc/TWinNTSystem.h rename to core/winnt/inc/ROOT/TWinNTSystem.h diff --git a/core/winnt/inc/Win32Constants.h b/core/winnt/inc/ROOT/Win32Constants.h similarity index 100% rename from core/winnt/inc/Win32Constants.h rename to core/winnt/inc/ROOT/Win32Constants.h diff --git a/core/winnt/inc/Windows4Root.h b/core/winnt/inc/ROOT/Windows4Root.h similarity index 100% rename from core/winnt/inc/Windows4Root.h rename to core/winnt/inc/ROOT/Windows4Root.h diff --git a/core/zip/CMakeLists.txt b/core/zip/CMakeLists.txt index 70716436263b8..77c3e0a4de68d 100644 --- a/core/zip/CMakeLists.txt +++ b/core/zip/CMakeLists.txt @@ -14,6 +14,7 @@ target_include_directories(Core PRIVATE ../../builtins/zip) target_include_directories(Core PUBLIC $ + $ # bw compatibility ) ROOT_INSTALL_HEADERS() diff --git a/core/zip/inc/Compression.h b/core/zip/inc/ROOT/Compression.h similarity index 100% rename from core/zip/inc/Compression.h rename to core/zip/inc/ROOT/Compression.h diff --git a/core/zip/inc/RZip.h b/core/zip/inc/ROOT/RZip.h similarity index 100% rename from core/zip/inc/RZip.h rename to core/zip/inc/ROOT/RZip.h diff --git a/rootx/CMakeLists.txt b/rootx/CMakeLists.txt index d6ceb48cedb86..d57fcf89b8396 100644 --- a/rootx/CMakeLists.txt +++ b/rootx/CMakeLists.txt @@ -17,9 +17,12 @@ endif() target_include_directories(root PRIVATE ${CMAKE_SOURCE_DIR}/core/foundation/inc + ${CMAKE_SOURCE_DIR}/core/foundation/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/core/base/inc + ${CMAKE_SOURCE_DIR}/core/base/inc/ROOT # bw compatibility ${CMAKE_SOURCE_DIR}/core/base/res ${CMAKE_SOURCE_DIR}/core/clib/inc # for snprintf.h ${CMAKE_SOURCE_DIR}/core/meta/inc # for TGenericClassInfo.h + ${CMAKE_SOURCE_DIR}/core/meta/inc/ROOT # bw compatibility ${CMAKE_BINARY_DIR}/ginclude # for RConfigure.h and rootCommandLineOptionsHelp.h )