diff --git a/roofit/batchcompute/CMakeLists.txt b/roofit/batchcompute/CMakeLists.txt index 9cea4b76ee183..b9b45820987ef 100644 --- a/roofit/batchcompute/CMakeLists.txt +++ b/roofit/batchcompute/CMakeLists.txt @@ -18,6 +18,31 @@ set(shared_object_sources src/RooBatchCompute.cxx src/ComputeFunctions.cxx) ROOT_LINKER_LIBRARY(RooBatchCompute_GENERIC ${shared_object_sources} TYPE SHARED DEPENDENCIES RooBatchCompute) target_compile_options(RooBatchCompute_GENERIC PRIVATE ${common-flags} -DRF_ARCH=GENERIC) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooBatchCompute + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS res/ + FILES + res/RooBatchCompute.h + ) + target_sources( + RooBatchCompute_GENERIC + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS src/ res/ + FILES + res/RooBatchComputeTypes.h + res/RooHeterogeneousMath.h + res/RooNaNPacker.h + src/Batches.h + src/RooVDTHeaders.h + ) +endif() + # Windows platform and ICC compiler need special code and testing, thus the feature has not been implemented yet for these. if (ROOT_PLATFORM MATCHES "linux|macosx" AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") @@ -43,6 +68,17 @@ if (cuda) set(shared_object_sources_cu src/RooBatchCompute.cu src/ComputeFunctions.cu src/CudaInterface.cu) ROOT_LINKER_LIBRARY(RooBatchCompute_CUDA ${shared_object_sources_cu} TYPE SHARED DEPENDENCIES RooBatchCompute) target_compile_options(RooBatchCompute_CUDA PRIVATE -lineinfo --expt-relaxed-constexpr) + if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooBatchCompute_CUDA + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS src/ + FILES + src/CudaInterface.h + ) + endif() endif() if(vdt OR builtin_vdt) diff --git a/roofit/codegen/CMakeLists.txt b/roofit/codegen/CMakeLists.txt index e1e5164c9e25d..fe92b3aea2a6e 100644 --- a/roofit/codegen/CMakeLists.txt +++ b/roofit/codegen/CMakeLists.txt @@ -21,3 +21,16 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitCodegen RooFitCore HistFactory ) + +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFitCodegen + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + # LinkDef.h # empty, not being used by ROOT_STL_PACKAGE call + inc/RooFit/CodegenImpl.h + ) +endif() diff --git a/roofit/histfactory/CMakeLists.txt b/roofit/histfactory/CMakeLists.txt index 6db7039d2a2fc..b5c3c6053d7a0 100644 --- a/roofit/histfactory/CMakeLists.txt +++ b/roofit/histfactory/CMakeLists.txt @@ -22,27 +22,31 @@ if (runtime_cxxmodules AND WIN32) set (EXTRA_DICT_OPTS NO_CXXMODULE) endif() +set(HISTFACTORY_HEADERS + RooStats/HistFactory/Asimov.h + RooStats/HistFactory/Channel.h + RooStats/HistFactory/Data.h + RooStats/HistFactory/Detail/HistFactoryImpl.h + RooStats/HistFactory/FlexibleInterpVar.h + RooStats/HistFactory/HistFactoryException.h + RooStats/HistFactory/HistFactoryModelUtils.h + RooStats/HistFactory/HistFactoryNavigation.h + RooStats/HistFactory/HistoToWorkspaceFactoryFast.h + RooStats/HistFactory/HistRef.h + RooStats/HistFactory/LinInterpVar.h + RooStats/HistFactory/MakeModelAndMeasurementsFast.h + RooStats/HistFactory/Measurement.h + RooStats/HistFactory/ParamHistFunc.h + RooStats/HistFactory/PiecewiseInterpolation.h + RooStats/HistFactory/PreprocessFunction.h + RooStats/HistFactory/RooBarlowBeestonLL.h + RooStats/HistFactory/Sample.h + RooStats/HistFactory/Systematics.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(HistFactory HEADERS - RooStats/HistFactory/Asimov.h - RooStats/HistFactory/Channel.h - RooStats/HistFactory/Data.h - RooStats/HistFactory/Detail/HistFactoryImpl.h - RooStats/HistFactory/FlexibleInterpVar.h - RooStats/HistFactory/HistFactoryException.h - RooStats/HistFactory/HistFactoryModelUtils.h - RooStats/HistFactory/HistFactoryNavigation.h - RooStats/HistFactory/HistoToWorkspaceFactoryFast.h - RooStats/HistFactory/HistRef.h - RooStats/HistFactory/LinInterpVar.h - RooStats/HistFactory/MakeModelAndMeasurementsFast.h - RooStats/HistFactory/Measurement.h - RooStats/HistFactory/ParamHistFunc.h - RooStats/HistFactory/PiecewiseInterpolation.h - RooStats/HistFactory/PreprocessFunction.h - RooStats/HistFactory/RooBarlowBeestonLL.h - RooStats/HistFactory/Sample.h - RooStats/HistFactory/Systematics.h + ${HISTFACTORY_HEADERS} ${HISTFACTORY_XML_HEADERS} SOURCES src/Asimov.cxx @@ -109,4 +113,20 @@ install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${prepareHistFactory_script} WORLD_EXECUTE WORLD_READ DESTINATION ${CMAKE_INSTALL_BINDIR}) +set(RELATIVE_INC_HEADERS ${HISTFACTORY_HEADERS} ${HISTFACTORY_XML_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + HistFactory + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h # seemingly not being used by ROOT_STL_PACKAGE call + inc/HFMsgService.h # not part of list above + ) +endif() + ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/roofit/hs3/CMakeLists.txt b/roofit/hs3/CMakeLists.txt index 581d031d68f8c..506d6d7889fa6 100644 --- a/roofit/hs3/CMakeLists.txt +++ b/roofit/hs3/CMakeLists.txt @@ -9,10 +9,14 @@ # @author Carsten Burgard, CERN ############################################################################ +set (ROOFITHS3_HEADERS + RooFitHS3/JSONIO.h + RooFitHS3/RooJSONFactoryWSTool.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(RooFitHS3 HEADERS - RooFitHS3/JSONIO.h - RooFitHS3/RooJSONFactoryWSTool.h + ${ROOFITHS3_HEADERS} SOURCES src/Domains.cxx src/JSONIO.cxx @@ -29,4 +33,23 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitHS3 RooFitJSONInterface ) +set(RELATIVE_INC_HEADERS ${ROOFITHS3_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFitHS3 + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ src/ + FILES + ${RELATIVE_INC_HEADERS} + # LinkDef.h # seemingly not being used by ROOT_STL_PACKAGE call + src/Domains.h + src/JSONIOUtils.h + src/static_execute.h + ) +endif() + + ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/roofit/jsoninterface/CMakeLists.txt b/roofit/jsoninterface/CMakeLists.txt index 37d6acd964916..71aeeb16fd61c 100644 --- a/roofit/jsoninterface/CMakeLists.txt +++ b/roofit/jsoninterface/CMakeLists.txt @@ -23,4 +23,19 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitJSONInterface target_link_libraries(RooFitJSONInterface PRIVATE nlohmann_json::nlohmann_json) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFitJSONInterface + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc src + FILES + src/RYMLParser.h + src/JSONParser.h + # LinkDef.h # is empty, not being used in ROOT_STL_PACKAGE call + inc/RooFit/Detail/JSONInterface.h + ) +endif() + ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/roofit/multiprocess/CMakeLists.txt b/roofit/multiprocess/CMakeLists.txt index 4843cd783b06c..880ebd2860617 100644 --- a/roofit/multiprocess/CMakeLists.txt +++ b/roofit/multiprocess/CMakeLists.txt @@ -30,6 +30,31 @@ target_include_directories(RooFitMultiProcess target_link_libraries(RooFitMultiProcess PRIVATE nlohmann_json::nlohmann_json) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFitMultiProcess + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ res/ src/ + FILES + inc/RooFit/MultiProcess/Config.h + inc/RooFit/MultiProcess/HeatmapAnalyzer.h + inc/RooFit/MultiProcess/types.h + res/RooFit/MultiProcess/JobManager.h + res/RooFit/MultiProcess/Job.h + res/RooFit/MultiProcess/Messenger.h + res/RooFit/MultiProcess/Messenger_decl.h + res/RooFit/MultiProcess/ProcessManager.h + res/RooFit/MultiProcess/ProcessTimer.h + res/RooFit/MultiProcess/Queue.h + res/RooFit/MultiProcess/util.h + res/RooFit/MultiProcess/worker.h + src/FIFOQueue.h + src/PriorityQueue.h + ) +endif() + ROOT_ADD_TEST_SUBDIRECTORY(test) ROOT_INSTALL_HEADERS() diff --git a/roofit/roofit/CMakeLists.txt b/roofit/roofit/CMakeLists.txt index 4df0457a1efa1..0552aaaab32e2 100644 --- a/roofit/roofit/CMakeLists.txt +++ b/roofit/roofit/CMakeLists.txt @@ -5,7 +5,7 @@ # For the list of contributors see $ROOTSYS/README/CREDITS. ############################################################################ -# CMakeLists.txt file for building ROOT rootfit package +# CMakeLists.txt file for building ROOT RooFit package # @author Pere Mato, CERN ############################################################################ @@ -14,72 +14,76 @@ if (runtime_cxxmodules AND WIN32) set (EXTRA_DICT_OPTS NO_CXXMODULE) endif() +set(ROOFIT_HEADERS + Roo2DKeysPdf.h + RooArgusBG.h + RooBCPEffDecay.h + RooBCPGenDecay.h + RooBDecay.h + RooBernstein.h + RooBifurGauss.h + RooBlindTools.h + RooBMixDecay.h + RooBreitWigner.h + RooBukinPdf.h + RooCBShape.h + RooCrystalBall.h + RooCFunction1Binding.h + RooCFunction2Binding.h + RooCFunction3Binding.h + RooCFunction4Binding.h + RooChebychev.h + RooChi2MCSModule.h + RooChiSquarePdf.h + RooDecay.h + RooDstD0BG.h + RooExponential.h + RooLegacyExpPoly.h + RooPowerSum.h + RooFunctor1DBinding.h + RooFunctorBinding.h + RooGamma.h + RooGaussExpTails.h + RooGaussian.h + RooGaussModel.h + RooGExpModel.h + RooHistConstraint.h + RooIntegralMorph.h + RooJeffreysPrior.h + RooKeysPdf.h + RooLagrangianMorphFunc.h + RooLandau.h + RooLognormal.h + RooMathCoreReg.h + RooMomentMorphFunc.h + RooMomentMorphFuncND.h + RooMomentMorph.h + RooMultiBinomial.h + RooNDKeysPdf.h + RooNonCPEigenDecay.h + RooNovosibirsk.h + RooParametricStepFunction.h + RooParamHistFunc.h + RooPoisson.h + RooPolynomial.h + RooPyBind.h + RooSpline.h + RooStepFunction.h + RooTFnBinding.h + RooTFnPdfBinding.h + RooTMathReg.h + RooUnblindCPAsymVar.h + RooUnblindOffset.h + RooUnblindPrecision.h + RooUnblindUniform.h + RooUniform.h + RooVoigtian.h + RooJohnson.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(RooFit HEADERS - Roo2DKeysPdf.h - RooArgusBG.h - RooBCPEffDecay.h - RooBCPGenDecay.h - RooBDecay.h - RooBernstein.h - RooBifurGauss.h - RooBlindTools.h - RooBMixDecay.h - RooBreitWigner.h - RooBukinPdf.h - RooCBShape.h - RooCrystalBall.h - RooCFunction1Binding.h - RooCFunction2Binding.h - RooCFunction3Binding.h - RooCFunction4Binding.h - RooChebychev.h - RooChi2MCSModule.h - RooChiSquarePdf.h - RooDecay.h - RooDstD0BG.h - RooExponential.h - RooLegacyExpPoly.h - RooPowerSum.h - RooFunctor1DBinding.h - RooFunctorBinding.h - RooGamma.h - RooGaussExpTails.h - RooGaussian.h - RooGaussModel.h - RooGExpModel.h - RooHistConstraint.h - RooIntegralMorph.h - RooJeffreysPrior.h - RooKeysPdf.h - RooLagrangianMorphFunc.h - RooLandau.h - RooLognormal.h - RooMathCoreReg.h - RooMomentMorphFunc.h - RooMomentMorphFuncND.h - RooMomentMorph.h - RooMultiBinomial.h - RooNDKeysPdf.h - RooNonCPEigenDecay.h - RooNovosibirsk.h - RooParametricStepFunction.h - RooParamHistFunc.h - RooPoisson.h - RooPolynomial.h - RooPyBind.h - RooSpline.h - RooStepFunction.h - RooTFnBinding.h - RooTFnPdfBinding.h - RooTMathReg.h - RooUnblindCPAsymVar.h - RooUnblindOffset.h - RooUnblindPrecision.h - RooUnblindUniform.h - RooUniform.h - RooVoigtian.h - RooJohnson.h + ${ROOFIT_HEADERS} SOURCES src/Roo2DKeysPdf.cxx src/RooArgusBG.cxx @@ -166,4 +170,20 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") target_compile_options(RooFit PUBLIC -fno-math-errno) endif() +set(RELATIVE_INC_HEADERS ${ROOFIT_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFit + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ src/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef1.h + src/RooFit/Detail/Algorithms.h + ) +endif() + ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/roofit/roofitZMQ/CMakeLists.txt b/roofit/roofitZMQ/CMakeLists.txt index efbdc1b07f0d9..1c1e3279cf517 100644 --- a/roofit/roofitZMQ/CMakeLists.txt +++ b/roofit/roofitZMQ/CMakeLists.txt @@ -21,4 +21,21 @@ target_compile_definitions(RooFitZMQ PUBLIC ZMQ_BUILD_DRAFT_API) # to avoid leaking symbols target_compile_definitions(RooFitZMQ PUBLIC ZMQ_NO_EXPORT) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFitZMQ + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS res/ + FILES + res/RooFit_ZMQ/ppoll.h + res/RooFit_ZMQ/Utility.h + res/RooFit_ZMQ/ZeroMQSvc.h + res/RooFit_ZMQ/ZeroMQPoller.h + res/RooFit_ZMQ/functions.h + ) +endif() + + ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/roofit/roofitcore/CMakeLists.txt b/roofit/roofitcore/CMakeLists.txt index ecea2202ed98c..633c087a36bb1 100644 --- a/roofit/roofitcore/CMakeLists.txt +++ b/roofit/roofitcore/CMakeLists.txt @@ -15,6 +15,13 @@ if(roofit_multiprocess) src/TestStatistics/LikelihoodJob.cxx src/TestStatistics/MinuitFcnGrad.cxx ) + set(RooFitMPTestStatisticsHeaders + src/TestStatistics/LikelihoodGradientJob.h + src/TestStatistics/ConstantTermsOptimizer.h + src/TestStatistics/LikelihoodSerial.h + src/TestStatistics/MinuitFcnGrad.h + src/TestStatistics/LikelihoodJob.h + ) list(APPEND EXTRA_LIBRARIES RooFitMultiProcess) #FIXME: The ProcessTimer.h exposes json in its interface: list(APPEND EXTRA_LIBRARIES nlohmann_json::nlohmann_json) @@ -24,7 +31,6 @@ endif() if(roofit_legacy_eval_backend) set(LegacyEvalBackendSources src/BidirMMapPipe.cxx - src/BidirMMapPipe.h src/RooAbsOptTestStatistic.cxx src/RooAbsTestStatistic.cxx src/RooChi2Var.cxx @@ -32,6 +38,15 @@ if(roofit_legacy_eval_backend) src/RooRealMPFE.cxx src/RooXYChi2Var.cxx ) + set(LegacyEvalBackendHeaders + src/BidirMMapPipe.h + src/RooAbsOptTestStatistic.h + src/RooAbsTestStatistic.h + src/RooChi2Var.h + src/RooNLLVar.h + src/RooRealMPFE.h + src/RooXYChi2Var.h + ) endif() set (EXTRA_DICT_OPTS) @@ -39,210 +54,214 @@ if (runtime_cxxmodules AND WIN32) set (EXTRA_DICT_OPTS NO_CXXMODULE) endif() +set(ROOFITCORE_HEADERS + Roo1DTable.h + RooAICRegistry.h + RooAbsAnaConvPdf.h + RooAbsArg.h + RooAbsBinning.h + RooAbsCache.h + RooAbsCacheElement.h + RooAbsCachedPdf.h + RooAbsCachedReal.h + RooAbsCategory.h + RooAbsCategoryLValue.h + RooAbsCollection.h + RooAbsData.h + RooAbsDataHelper.h + RooAbsDataStore.h + RooAbsFunc.h + RooAbsGenContext.h + RooAbsHiddenReal.h + RooAbsIntegrator.h + RooAbsLValue.h + RooAbsMCStudyModule.h + RooAbsMoment.h + RooAbsPdf.h + RooAbsProxy.h + RooAbsReal.h + RooAbsRealLValue.h + RooAbsSelfCachedPdf.h + RooAbsSelfCachedReal.h + RooAbsStudy.h + RooAddGenContext.h + RooAddModel.h + RooAddPdf.h + RooAddition.h + RooArgList.h + RooArgProxy.h + RooArgSet.h + RooBinSamplingPdf.h + RooBinWidthFunction.h + RooBinnedGenContext.h + RooBinning.h + RooBinningCategory.h + RooBrentRootFinder.h + RooCacheManager.h + RooCachedPdf.h + RooCachedReal.h + RooCategory.h + RooCategoryProxy.h + RooChangeTracker.h + RooClassFactory.h + RooCmdArg.h + RooCmdConfig.h + RooCollectionProxy.h + RooCompositeDataStore.h + RooConstVar.h + RooConstraintSum.h + RooConvCoefVar.h + RooConvGenContext.h + RooCurve.h + RooCustomizer.h + RooDLLSignificanceMCSModule.h + RooDataHist.h + RooDataHistSliceIter.h + RooDataProjBinding.h + RooDataSet.h + RooDerivative.h + RooDirItem.h + RooDouble.h + RooEffGenContext.h + RooEffProd.h + RooEfficiency.h + RooEllipse.h + RooErrorHandler.h + RooErrorVar.h + RooEvaluatorWrapper.h + RooExpensiveObjectCache.h + RooExtendPdf.h + RooExtendedBinding.h + RooExtendedTerm.h + RooFFTConvPdf.h + RooFactoryWSTool.h + RooFirstMoment.h + RooFit.h + RooFit/CodegenContext.h + RooFit/Config.h + RooFit/Detail/MathFuncs.h + RooFit/Detail/NormalizationHelpers.h + RooFit/Detail/RooNLLVarNew.h + RooFit/Detail/RooNormalizedPdf.h + RooFit/EvalContext.h + RooFit/Evaluator.h + RooFit/Floats.h + RooFit/ModelConfig.h + RooFit/TestStatistics/LikelihoodGradientWrapper.h + RooFit/TestStatistics/LikelihoodWrapper.h + RooFit/TestStatistics/RooAbsL.h + RooFit/TestStatistics/RooBinnedL.h + RooFit/TestStatistics/RooRealL.h + RooFit/TestStatistics/RooSubsidiaryL.h + RooFit/TestStatistics/RooSumL.h + RooFit/TestStatistics/RooUnbinnedL.h + RooFit/TestStatistics/SharedOffset.h + RooFit/TestStatistics/buildLikelihood.h + RooFitLegacy/RooCatTypeLegacy.h + RooFitLegacy/RooCategorySharedProperties.h + RooFitLegacy/RooTreeData.h + RooFitResult.h + RooFormulaVar.h + RooFracRemainder.h + RooFunctor.h + RooGenContext.h + RooGenFitStudy.h + RooGenericPdf.h + RooGlobalFunc.h + RooHelpers.h + RooHist.h + RooHistError.h + RooHistFunc.h + RooHistPdf.h + RooInvTransform.h + RooLinTransBinning.h + RooLinearCombination.h + RooLinearVar.h + RooLinkedList.h + RooLinkedListElem.h + RooLinkedListIter.h + RooListProxy.h + RooMCStudy.h + RooMappedCategory.h + RooMath.h + RooMinimizer.h + RooMoment.h + RooMsgService.h + RooMultiCategory.h + RooMultiPdf.h + RooMultiReal.h + RooMultiVarGaussian.h + RooNameReg.h + RooNormSetCache.h + RooNumCdf.h + RooNumConvPdf.h + RooNumConvolution.h + RooNumGenConfig.h + RooNumIntConfig.h + RooNumIntFactory.h + RooNumRunningInt.h + RooNumber.h + RooObjCacheManager.h + RooParamBinning.h + RooPlot.h + RooPlotable.h + RooPolyFunc.h + RooPolyVar.h + RooPrintable.h + RooProdGenContext.h + RooProdPdf.h + RooProduct.h + RooProfileLL.h + RooProjectedPdf.h + RooPullVar.h + RooQuasiRandomGenerator.h + RooRandom.h + RooRandomizeParamMCSModule.h + RooRangeBinning.h + RooRangeBoolean.h + RooRatio.h + RooRealBinding.h + RooRealConstant.h + RooRealIntegral.h + RooRealProxy.h + RooRealSumFunc.h + RooRealSumPdf.h + RooRealVar.h + RooRealVarSharedProperties.h + RooRecursiveFraction.h + RooRefCountList.h + RooResolutionModel.h + RooSTLRefCountList.h + RooSecondMoment.h + RooSetProxy.h + RooSharedProperties.h + RooSimGenContext.h + RooSimSplitGenContext.h + RooSimWSTool.h + RooSimultaneous.h + RooStreamParser.h + RooStringVar.h + RooStringView.h + RooStudyManager.h + RooStudyPackage.h + RooSuperCategory.h + RooTObjWrap.h + RooTable.h + RooTemplateProxy.h + RooThresholdCategory.h + RooTrace.h + RooTreeDataStore.h + RooTruthModel.h + RooUniformBinning.h + RooVectorDataStore.h + RooWorkspace.h + RooWorkspaceHandle.h + RooWrapperPdf.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(RooFitCore HEADERS - Roo1DTable.h - RooAICRegistry.h - RooAbsAnaConvPdf.h - RooAbsArg.h - RooAbsBinning.h - RooAbsCache.h - RooAbsCacheElement.h - RooAbsCachedPdf.h - RooAbsCachedReal.h - RooAbsCategory.h - RooAbsCategoryLValue.h - RooAbsCollection.h - RooAbsData.h - RooAbsDataHelper.h - RooAbsDataStore.h - RooAbsFunc.h - RooAbsGenContext.h - RooAbsHiddenReal.h - RooAbsIntegrator.h - RooAbsLValue.h - RooAbsMCStudyModule.h - RooAbsMoment.h - RooAbsPdf.h - RooAbsProxy.h - RooAbsReal.h - RooAbsRealLValue.h - RooAbsSelfCachedPdf.h - RooAbsSelfCachedReal.h - RooAbsStudy.h - RooAddGenContext.h - RooAddModel.h - RooAddPdf.h - RooAddition.h - RooArgList.h - RooArgProxy.h - RooArgSet.h - RooBinSamplingPdf.h - RooBinWidthFunction.h - RooBinnedGenContext.h - RooBinning.h - RooBinningCategory.h - RooBrentRootFinder.h - RooCacheManager.h - RooCachedPdf.h - RooCachedReal.h - RooCategory.h - RooCategoryProxy.h - RooChangeTracker.h - RooClassFactory.h - RooCmdArg.h - RooCmdConfig.h - RooCollectionProxy.h - RooCompositeDataStore.h - RooConstVar.h - RooConstraintSum.h - RooConvCoefVar.h - RooConvGenContext.h - RooCurve.h - RooCustomizer.h - RooDLLSignificanceMCSModule.h - RooDataHist.h - RooDataHistSliceIter.h - RooDataProjBinding.h - RooDataSet.h - RooDerivative.h - RooDirItem.h - RooDouble.h - RooEffGenContext.h - RooEffProd.h - RooEfficiency.h - RooEllipse.h - RooErrorHandler.h - RooErrorVar.h - RooEvaluatorWrapper.h - RooExpensiveObjectCache.h - RooExtendPdf.h - RooExtendedBinding.h - RooExtendedTerm.h - RooFFTConvPdf.h - RooFactoryWSTool.h - RooFirstMoment.h - RooFit.h - RooFit/CodegenContext.h - RooFit/Config.h - RooFit/Detail/MathFuncs.h - RooFit/Detail/NormalizationHelpers.h - RooFit/Detail/RooNLLVarNew.h - RooFit/Detail/RooNormalizedPdf.h - RooFit/EvalContext.h - RooFit/Evaluator.h - RooFit/Floats.h - RooFit/ModelConfig.h - RooFit/TestStatistics/LikelihoodGradientWrapper.h - RooFit/TestStatistics/LikelihoodWrapper.h - RooFit/TestStatistics/RooAbsL.h - RooFit/TestStatistics/RooBinnedL.h - RooFit/TestStatistics/RooRealL.h - RooFit/TestStatistics/RooSubsidiaryL.h - RooFit/TestStatistics/RooSumL.h - RooFit/TestStatistics/RooUnbinnedL.h - RooFit/TestStatistics/SharedOffset.h - RooFit/TestStatistics/buildLikelihood.h - RooFitLegacy/RooCatTypeLegacy.h - RooFitLegacy/RooCategorySharedProperties.h - RooFitLegacy/RooTreeData.h - RooFitResult.h - RooFormulaVar.h - RooFracRemainder.h - RooFunctor.h - RooGenContext.h - RooGenFitStudy.h - RooGenericPdf.h - RooGlobalFunc.h - RooHelpers.h - RooHist.h - RooHistError.h - RooHistFunc.h - RooHistPdf.h - RooInvTransform.h - RooLinTransBinning.h - RooLinearCombination.h - RooLinearVar.h - RooLinkedList.h - RooLinkedListElem.h - RooLinkedListIter.h - RooListProxy.h - RooMCStudy.h - RooMappedCategory.h - RooMath.h - RooMinimizer.h - RooMoment.h - RooMsgService.h - RooMultiCategory.h - RooMultiPdf.h - RooMultiReal.h - RooMultiVarGaussian.h - RooNameReg.h - RooNormSetCache.h - RooNumCdf.h - RooNumConvPdf.h - RooNumConvolution.h - RooNumGenConfig.h - RooNumIntConfig.h - RooNumIntFactory.h - RooNumRunningInt.h - RooNumber.h - RooObjCacheManager.h - RooParamBinning.h - RooPlot.h - RooPlotable.h - RooPolyFunc.h - RooPolyVar.h - RooPrintable.h - RooProdGenContext.h - RooProdPdf.h - RooProduct.h - RooProfileLL.h - RooProjectedPdf.h - RooPullVar.h - RooQuasiRandomGenerator.h - RooRandom.h - RooRandomizeParamMCSModule.h - RooRangeBinning.h - RooRangeBoolean.h - RooRatio.h - RooRealBinding.h - RooRealConstant.h - RooRealIntegral.h - RooRealProxy.h - RooRealSumFunc.h - RooRealSumPdf.h - RooRealVar.h - RooRealVarSharedProperties.h - RooRecursiveFraction.h - RooRefCountList.h - RooResolutionModel.h - RooSTLRefCountList.h - RooSecondMoment.h - RooSetProxy.h - RooSharedProperties.h - RooSimGenContext.h - RooSimSplitGenContext.h - RooSimWSTool.h - RooSimultaneous.h - RooStreamParser.h - RooStringVar.h - RooStringView.h - RooStudyManager.h - RooStudyPackage.h - RooSuperCategory.h - RooTObjWrap.h - RooTable.h - RooTemplateProxy.h - RooThresholdCategory.h - RooTrace.h - RooTreeDataStore.h - RooTruthModel.h - RooUniformBinning.h - RooVectorDataStore.h - RooWorkspace.h - RooWorkspaceHandle.h - RooWrapperPdf.h + ${ROOFITCORE_HEADERS} SOURCES src/BatchModeDataHelpers.cxx src/ConstraintHelpers.cxx @@ -508,4 +527,47 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") target_compile_options(RooFitCore PUBLIC -fno-math-errno) endif() +set(RELATIVE_INC_HEADERS ${ROOFITCORE_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFitCore + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ res/ src/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h + inc/RooFit/UniqueId.h # Was not being included in ROOT_STL_PACKAGE call + src/RooConvIntegrandBinding.h + src/RooFormula.h + src/RooFitLegacy/RooAbsCategoryLegacyIterator.h + src/RooMCIntegrator.h + src/RooFoamGenerator.h + src/RooAbsMinimizerFcn.h + src/RooSentinel.h + src/RooAcceptReject.h + src/TreeReadBuffer.h + src/ConstraintHelpers.h + src/RooRombergIntegrator.h + src/RooBinIntegrator.h + ${RooFitMPTestStatisticsHeaders} + ${LegacyEvalBackendHeaders} + src/RooFit/BatchModeDataHelpers.h + src/RooMinimizerFcn.h + src/RooAbsNumGenerator.h + src/FitHelpers.h + src/RooGenProdProj.h + src/RooNumGenFactory.h + src/RooGrid.h + src/RooAddHelpers.h + src/RooAdaptiveIntegratorND.h + src/ValueChecking.h + src/RooImproperIntegrator1D.h + res/RooFitImplHelpers.h + res/RooUnitTest.h + ) +endif() + ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/roofit/roofitmore/CMakeLists.txt b/roofit/roofitmore/CMakeLists.txt index 39cdeacd780db..99ebfeeede44c 100644 --- a/roofit/roofitmore/CMakeLists.txt +++ b/roofit/roofitmore/CMakeLists.txt @@ -18,14 +18,18 @@ if (runtime_cxxmodules AND WIN32) set (EXTRA_DICT_OPTS NO_CXXMODULE) endif() +set (ROOFITMORE_HEADERS + RooFitMoreLib.h + RooLegendre.h + RooMathMoreReg.h + RooSpHarmonic.h + RooNonCentralChiSquare.h + RooHypatia2.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(RooFitMore HEADERS - RooFitMoreLib.h - RooLegendre.h - RooMathMoreReg.h - RooSpHarmonic.h - RooNonCentralChiSquare.h - RooHypatia2.h + ${ROOFITMORE_HEADERS} SOURCES src/RooFitMoreLib.cxx src/RooAdaptiveGaussKronrodIntegrator1D.cxx @@ -66,4 +70,22 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") target_compile_options(RooFitMore PUBLIC -fno-math-errno) endif() +set(RELATIVE_INC_HEADERS ${ROOFITMORE_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFitMore + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ src/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h + src/BracketAdapters.h + src/RooAdaptiveGaussKronrodIntegrator1D.h + src/RooGaussKronrodIntegrator1D.h + ) +endif() + ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/roofit/roostats/CMakeLists.txt b/roofit/roostats/CMakeLists.txt index 6d81e76646138..d9f10670a2030 100644 --- a/roofit/roostats/CMakeLists.txt +++ b/roofit/roostats/CMakeLists.txt @@ -14,65 +14,69 @@ if (runtime_cxxmodules AND WIN32) set (EXTRA_DICT_OPTS NO_CXXMODULE) endif() +set (ROOSTATS_HEADERS + RooStats/AsymptoticCalculator.h + RooStats/BayesianCalculator.h + RooStats/BernsteinCorrection.h + RooStats/CombinedCalculator.h + RooStats/ConfidenceBelt.h + RooStats/ConfInterval.h + RooStats/DebuggingSampler.h + RooStats/DebuggingTestStat.h + RooStats/DetailedOutputAggregator.h + RooStats/FeldmanCousins.h + RooStats/FrequentistCalculator.h + RooStats/Heaviside.h + RooStats/HybridCalculator.h + RooStats/HybridPlot.h + RooStats/HybridResult.h + RooStats/HypoTestCalculatorGeneric.h + RooStats/HypoTestCalculator.h + RooStats/HypoTestInverter.h + RooStats/HypoTestInverterPlot.h + RooStats/HypoTestInverterResult.h + RooStats/HypoTestPlot.h + RooStats/HypoTestResult.h + RooStats/IntervalCalculator.h + RooStats/LikelihoodInterval.h + RooStats/LikelihoodIntervalPlot.h + RooStats/MarkovChain.h + RooStats/MaxLikelihoodEstimateTestStat.h + RooStats/MCMCCalculator.h + RooStats/MCMCInterval.h + RooStats/MCMCIntervalPlot.h + RooStats/MetropolisHastings.h + RooStats/ModelConfig.h + RooStats/NeymanConstruction.h + RooStats/NumberCountingPdfFactory.h + RooStats/NumberCountingUtils.h + RooStats/NumEventsTestStat.h + RooStats/PdfProposal.h + RooStats/PointSetInterval.h + RooStats/ProfileInspector.h + RooStats/ProfileLikelihoodCalculator.h + RooStats/ProfileLikelihoodTestStat.h + RooStats/ProposalFunction.h + RooStats/ProposalHelper.h + RooStats/RatioOfProfiledLikelihoodsTestStat.h + RooStats/RooStatsUtils.h + RooStats/SamplingDistPlot.h + RooStats/SamplingDistribution.h + RooStats/SequentialProposal.h + RooStats/SimpleInterval.h + RooStats/SimpleLikelihoodRatioTestStat.h + RooStats/SPlot.h + RooStats/TestStatistic.h + RooStats/TestStatSampler.h + RooStats/ToyMCImportanceSampler.h + RooStats/ToyMCSampler.h + RooStats/UniformProposal.h + RooStats/UpperLimitMCSModule.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(RooStats HEADERS - RooStats/AsymptoticCalculator.h - RooStats/BayesianCalculator.h - RooStats/BernsteinCorrection.h - RooStats/CombinedCalculator.h - RooStats/ConfidenceBelt.h - RooStats/ConfInterval.h - RooStats/DebuggingSampler.h - RooStats/DebuggingTestStat.h - RooStats/DetailedOutputAggregator.h - RooStats/FeldmanCousins.h - RooStats/FrequentistCalculator.h - RooStats/Heaviside.h - RooStats/HybridCalculator.h - RooStats/HybridPlot.h - RooStats/HybridResult.h - RooStats/HypoTestCalculatorGeneric.h - RooStats/HypoTestCalculator.h - RooStats/HypoTestInverter.h - RooStats/HypoTestInverterPlot.h - RooStats/HypoTestInverterResult.h - RooStats/HypoTestPlot.h - RooStats/HypoTestResult.h - RooStats/IntervalCalculator.h - RooStats/LikelihoodInterval.h - RooStats/LikelihoodIntervalPlot.h - RooStats/MarkovChain.h - RooStats/MaxLikelihoodEstimateTestStat.h - RooStats/MCMCCalculator.h - RooStats/MCMCInterval.h - RooStats/MCMCIntervalPlot.h - RooStats/MetropolisHastings.h - RooStats/ModelConfig.h - RooStats/NeymanConstruction.h - RooStats/NumberCountingPdfFactory.h - RooStats/NumberCountingUtils.h - RooStats/NumEventsTestStat.h - RooStats/PdfProposal.h - RooStats/PointSetInterval.h - RooStats/ProfileInspector.h - RooStats/ProfileLikelihoodCalculator.h - RooStats/ProfileLikelihoodTestStat.h - RooStats/ProposalFunction.h - RooStats/ProposalHelper.h - RooStats/RatioOfProfiledLikelihoodsTestStat.h - RooStats/RooStatsUtils.h - RooStats/SamplingDistPlot.h - RooStats/SamplingDistribution.h - RooStats/SequentialProposal.h - RooStats/SimpleInterval.h - RooStats/SimpleLikelihoodRatioTestStat.h - RooStats/SPlot.h - RooStats/TestStatistic.h - RooStats/TestStatSampler.h - RooStats/ToyMCImportanceSampler.h - RooStats/ToyMCSampler.h - RooStats/UniformProposal.h - RooStats/UpperLimitMCSModule.h + ${ROOSTATS_HEADERS} SOURCES src/AsymptoticCalculator.cxx src/BayesianCalculator.cxx @@ -137,4 +141,19 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooStats ${EXTRA_DICT_OPTS} ) +set(RELATIVE_INC_HEADERS ${ROOSTATS_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooStats + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h # seemingly this is not being used in ROOT_STL_PACKAGE call + ) +endif() + ROOT_ADD_TEST_SUBDIRECTORY(test) diff --git a/roofit/xroofit/CMakeLists.txt b/roofit/xroofit/CMakeLists.txt index c7c0a2638ffd5..82dd1eb0f0c29 100644 --- a/roofit/xroofit/CMakeLists.txt +++ b/roofit/xroofit/CMakeLists.txt @@ -1,12 +1,16 @@ +set (XROOFIT_HEADERS + RooBrowser.h + XRooFit.h + RooFit/xRooFit/xRooFit.h + RooFit/xRooFit/xRooNode.h + RooFit/xRooFit/xRooNLLVar.h + RooFit/xRooFit/xRooHypoSpace.h + RooFit/xRooFit/xRooBrowser.h +) + ROOT_STANDARD_LIBRARY_PACKAGE(RooFitXRooFit HEADERS - RooBrowser.h - XRooFit.h - RooFit/xRooFit/xRooFit.h - RooFit/xRooFit/xRooNode.h - RooFit/xRooFit/xRooNLLVar.h - RooFit/xRooFit/xRooHypoSpace.h - RooFit/xRooFit/xRooBrowser.h + ${XROOFIT_HEADERS} SOURCES src/Asymptotics.cxx src/xRooBrowser.cxx @@ -33,4 +37,23 @@ ROOT_STANDARD_LIBRARY_PACKAGE(RooFitXRooFit target_include_directories(RooFitXRooFit PRIVATE inc/RooFit) +set(RELATIVE_INC_HEADERS ${XROOFIT_HEADERS}) +list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/) +if(NOT CMAKE_VERSION VERSION_LESS "3.23.0") + target_sources( + RooFitXRooFit + PRIVATE + FILE_SET private_header_files + TYPE HEADERS + BASE_DIRS inc/ src/ + FILES + ${RELATIVE_INC_HEADERS} + inc/LinkDef.h + inc/RooFit/xRooFit/Config.h # was not part of XROOFIT_HEADERS + src/coutCapture.h + src/xRooFitVersion.h + + ) +endif() + ROOT_ADD_TEST_SUBDIRECTORY(test)