[RF] Add RooFit header to private CMake filesets

To improve IDE experience.
See also root-project#18419
and root-project#20515

Author: ferdymercury

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)

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()

roofit/histfactory/CMakeLists.txt

@@ -22,20 +22,24 @@ if (runtime_cxxmodules AND WIN32)
   set (EXTRA_DICT_OPTS NO_CXXMODULE)
 endif()
 
+set(HISTFACTORY_HEADERS
+  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/LinInterpVar.h
+  RooStats/HistFactory/MakeModelAndMeasurementsFast.h
+  RooStats/HistFactory/Measurement.h
+  RooStats/HistFactory/ParamHistFunc.h
+  RooStats/HistFactory/PiecewiseInterpolation.h
+  RooStats/HistFactory/RooBarlowBeestonLL.h
+)
+
 ROOT_STANDARD_LIBRARY_PACKAGE(HistFactory
   HEADERS
-    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/LinInterpVar.h
-    RooStats/HistFactory/MakeModelAndMeasurementsFast.h
-    RooStats/HistFactory/Measurement.h
-    RooStats/HistFactory/ParamHistFunc.h
-    RooStats/HistFactory/PiecewiseInterpolation.h
-    RooStats/HistFactory/RooBarlowBeestonLL.h
+    ${HISTFACTORY_HEADERS}
     ${HISTFACTORY_XML_HEADERS}
   SOURCES
     src/FlexibleInterpVar.cxx
@@ -95,4 +99,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)

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)

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)

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()

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)