From 04e1a29db1a698ba43dd0cc5765a76c88ed92001 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 15:00:38 +0000 Subject: [PATCH 01/19] first attempt to add cms combine software --- Externals/CMSCombine/CMakeLists.txt | 58 +++++++++++++++++++ .../CMSCombine/cmake/FindCMSCombine.cmake | 31 ++++++++++ ProjectOptions/CMakeLists.txt | 1 + 3 files changed, 90 insertions(+) create mode 100644 Externals/CMSCombine/CMakeLists.txt create mode 100644 Externals/CMSCombine/cmake/FindCMSCombine.cmake diff --git a/Externals/CMSCombine/CMakeLists.txt b/Externals/CMSCombine/CMakeLists.txt new file mode 100644 index 0000000..49285a4 --- /dev/null +++ b/Externals/CMSCombine/CMakeLists.txt @@ -0,0 +1,58 @@ +# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration +# +# Package building CMSCombine for StatAnalysis releases +# + +# The name of the package: +atlas_subdir( CMSCombine ) + +# Set token if it exists, otherwise use no token +if(CI_JOB_TOKEN) + set( _token "gitlab-ci-token:${CI_JOB_TOKEN}@" ) +else() + set( _token "" ) +endif() + +set( STATANA_CMSCOMBINE_REPOSITORY "${CERN_GITLAB_WITH_TOKEN}/will/cmscombine.git" CACHE STRING "Repository of cmscombine" ) + +set( _buildDir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMSCombineBuild ) + +if(STATANA_VERBOSE) + set(_logging OFF) +else() + set(_logging ON) +endif() + +# Build lwtnn for the build area: +ExternalProject_Add( CMSCombine + PREFIX ${CMAKE_BINARY_DIR} + INSTALL_DIR ${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM} + GIT_REPOSITORY ${STATANA_CMSCOMBINE_REPOSITORY} + GIT_TAG ${STATANA_CMSCOMBINE_VERSION} + BUILD_ALWAYS ${TRACK_CHANGES} + CMAKE_CACHE_ARGS + -DCMAKE_INSTALL_PREFIX:PATH=${_buildDir} + -DCMAKE_PREFIX_PATH:PATH=${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM} # ensures will discover the release's version of ROOT + LOG_DOWNLOAD ${_logging} LOG_CONFIGURE ${_logging} LOG_BUILD ${_logging} LOG_INSTALL ${_logging} + LOG_OUTPUT_ON_FAILURE 1 + UPDATE_COMMAND "" # needed for next line to work + UPDATE_DISCONNECTED TRUE) # skips reconfigure+build if just rerunning. +ExternalProject_Add_Step( CMSCombine buildinstall + COMMAND ${CMAKE_COMMAND} -E copy_directory ${_buildDir} <INSTALL_DIR> + COMMENT "Installing CMSCombine into the build area" + DEPENDEES install + ) + +if( ATLAS_BUILD_ROOT ) + add_dependencies ( CMSCombine ROOT ) +endif() + +add_dependencies( CMSCombine Eigen Boost ) + + +# Install CMSCombine: +install( DIRECTORY ${_buildDir}/ + DESTINATION . USE_SOURCE_PERMISSIONS OPTIONAL ) + +install( FILES cmake/FindCMSCombine.cmake + DESTINATION ${CMAKE_INSTALL_CMAKEDIR}/modules OPTIONAL ) diff --git a/Externals/CMSCombine/cmake/FindCMSCombine.cmake b/Externals/CMSCombine/cmake/FindCMSCombine.cmake new file mode 100644 index 0000000..fb9645f --- /dev/null +++ b/Externals/CMSCombine/cmake/FindCMSCombine.cmake @@ -0,0 +1,31 @@ +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +# +# Locate the CMSCombine external package. +# +# Defines: +# CMSCOMBINE_FOUND +# CMSCOMBINE_INCLUDE_DIR +# CMSCOMBINE_INCLUDE_DIRS +# CMSCOMBINE_LIBRARIES +# CMSCOMBINE_LIBRARY_DIRS +# +# The user can set CMSCOMBINE_ATROOT to guide the script. +# + +# Include the helper code: +include( AtlasInternals ) + +# Declare the module: +atlas_external_module( NAME CMSCombine + INCLUDE_SUFFIXES include INCLUDE_NAMES CMSCombine + LIBRARY_SUFFIXES lib + COMPULSORY_COMPONENTS CMSCombine ) + +# Handle the standard find_package arguments: +include( FindPackageHandleStandardArgs ) +find_package_handle_standard_args( CMSCombine DEFAULT_MSG CMSCOMBINE_INCLUDE_DIRS + CMSCOMBINE_LIBRARIES ) +mark_as_advanced( CMSCOMBINE_FOUND CMSCOMBINE_INCLUDE_DIR CMSCOMBINE_INCLUDE_DIRS + CMSCOMBINE_LIBRARIES CMSCOMBINE_LIBRARY_DIRS ) + + diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index ff1521a..d079e46 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -100,6 +100,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) +set( STATANA_CMSCOMBINE_VERSION "f284885c" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 15a78f9b4cde9ea93d25112f05c2a65466bd9a26 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 15:07:14 +0000 Subject: [PATCH 02/19] add eigen - required by cms --- package_filters.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package_filters.txt b/package_filters.txt index f28ff71..128fc55 100644 --- a/package_filters.txt +++ b/package_filters.txt @@ -8,7 +8,8 @@ + Externals/atlasexternals/External/dcap # + Externals/atlasexternals/External/Python # + Externals/atlasexternals/External/TBB -- ROOT can build for us - +# eigen needed for cmscombine ++ Externals/atlasexternals/External/Eigen # Do not pick up anything else from atlasexternals. - Externals/atlasexternals.* -- GitLab From 29e026ab0b3fba5c8ff827f1b7eeab8131c460c2 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 15:15:46 +0000 Subject: [PATCH 03/19] try fix eigen dependency --- Externals/CMSCombine/CMakeLists.txt | 6 ++++++ ProjectOptions/CMakeLists.txt | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/Externals/CMSCombine/CMakeLists.txt b/Externals/CMSCombine/CMakeLists.txt index 49285a4..69f1faf 100644 --- a/Externals/CMSCombine/CMakeLists.txt +++ b/Externals/CMSCombine/CMakeLists.txt @@ -6,6 +6,12 @@ # The name of the package: atlas_subdir( CMSCombine ) +find_package(Eigen QUIET) +if(NOT EIGEN_FOUND AND NOT ATLAS_BUILD_EIGEN) + message(STATUS "WARNING: Cannot build CMSCombine without Eigen") + return() +endif() + # Set token if it exists, otherwise use no token if(CI_JOB_TOKEN) set( _token "gitlab-ci-token:${CI_JOB_TOKEN}@" ) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index d079e46..19a116e 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -10,6 +10,7 @@ find_package( dcap QUIET ) find_package( Davix QUIET ) find_package( OpenSSL QUIET ) find_package( UUID QUIET ) +find_package( Eigen QUIET ) # find_package( TBB 2018 QUIET ) # - commented out because trouble with 2021 versions so just build in the project instead # Get the OS name. @@ -48,6 +49,14 @@ endif() option( ATLAS_BUILD_XROOTD "Build XRootD as part of the release" ${_flag} ) +if (NOT EIGEN_FOUND OR ATLAS_BUILD_EIGEN ) + set( _flag TRUE ) +else() + set( _flag FALSE ) +endif() + +option( ATLAS_BUILD_EIGEN "Build Eigen as part of the release" ${_flag} ) + # Decide whether to build DCAP. set( _flag FALSE ) #if( NOT DCAP_FOUND AND _osIsValid AND -- GitLab From ef898e12988c0ab75966d861772f480adfefac7b Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 15:34:35 +0000 Subject: [PATCH 04/19] update version --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 19a116e..2a735f0 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "f284885c" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "cec61044" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 5723656d13696a6ccfded2dd5492989be4a04d04 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 15:53:57 +0000 Subject: [PATCH 05/19] try to fix --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 2a735f0..f3bf9d0 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "cec61044" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "20b29f25" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From a9a5f672f2778bbcd41942006fcf91f33cb28b40 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 16:32:05 +0000 Subject: [PATCH 06/19] try to fix --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index f3bf9d0..57f84d2 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "20b29f25" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "51cbf74d" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 905b92d6b2c8fbefd6c0b761a4de5781262fbf7c Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 16:58:11 +0000 Subject: [PATCH 07/19] try to fix --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 57f84d2..53528b3 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "51cbf74d" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "6d7e380b" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 70fd1490e02ae351a1758e9af4514ccb1c341391 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 17:40:33 +0000 Subject: [PATCH 08/19] try to fix --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 53528b3..7dde979 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "6d7e380b" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "ddbdf7da" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From be6bcb1b2b35a498d12ccac9f2be5e190250944b Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Thu, 10 Nov 2022 18:01:53 +0000 Subject: [PATCH 09/19] try to fix --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 7dde979..38bda4f 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "ddbdf7da" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "2e089071" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 5d77bffea95a65cd86f9db2d081ac6dd45e1faf3 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 09:39:29 +0000 Subject: [PATCH 10/19] try to fix rootmap --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 38bda4f..7f289b3 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "2e089071" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "f2405ad1" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 7a2fc30cef9213245d05f0e98af7fbb808f0b205 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 09:57:20 +0000 Subject: [PATCH 11/19] try to fix rootmap --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 7f289b3..5058f1c 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "f2405ad1" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "82a75f78" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From bf04f5ad709e3abd61597b53c5efa2036e06da6d Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 10:20:39 +0000 Subject: [PATCH 12/19] try to fix rootmap --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 5058f1c..1dc678e 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "82a75f78" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "158fa41e" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 16f44cb9f6d958b30fa2e52e2e04aa17580aa332 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 14:10:43 +0000 Subject: [PATCH 13/19] install headers --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 1dc678e..f1de63c 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "158fa41e" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "7be9073c" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 58f27de11cde016eba31c29aaac71134b97f7a68 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 15:29:12 +0000 Subject: [PATCH 14/19] install headers --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index f1de63c..5ea841e 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "7be9073c" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "6b4f7351" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 1f0a613ad831083a7edb0709dc65e5b5664947ef Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 15:44:58 +0000 Subject: [PATCH 15/19] generate pcm --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 5ea841e..539df4c 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "6b4f7351" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "da3bc220" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From dbb774c54ba0b2a3ad0ad5e66f8e4f7a2eba2f11 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 17:14:38 +0000 Subject: [PATCH 16/19] generate pcm --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 539df4c..cb873e9 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "da3bc220" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "c76edc66" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 3cf9c23a13e5ec229cc03d66eacccfa96956c785 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 17:16:33 +0000 Subject: [PATCH 17/19] generate pcm --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index cb873e9..2765197 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "c76edc66" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "70cb04b2" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From a120cbc7aef08f2f3111796b28296d128330e75e Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 22:09:09 +0000 Subject: [PATCH 18/19] try empty pcm --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 2765197..88281f4 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "70cb04b2" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "bd4760a1" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab From 904be29490b8b377243d18d6f09e0d5d091a0300 Mon Sep 17 00:00:00 2001 From: will buttinger <will@cern.ch> Date: Fri, 11 Nov 2022 22:45:39 +0000 Subject: [PATCH 19/19] revert pcm --- ProjectOptions/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectOptions/CMakeLists.txt b/ProjectOptions/CMakeLists.txt index 88281f4..52aa02d 100644 --- a/ProjectOptions/CMakeLists.txt +++ b/ProjectOptions/CMakeLists.txt @@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "924c8b60" CACHE STRING "Version of RooUnfold" ) set( STATANA_QUICKFIT_VERSION "df48d3" CACHE STRING "Version of quickFit" ) set( STATANA_WORKSPACECOMBINER_VERSION "8c0a7050" CACHE STRING "Version of workspaceCombiner" ) set( STATANA_XMLANAWSBUILDER_VERSION "4b0d11f8" CACHE STRING "Version of xmlAnaWSBuilder" ) -set( STATANA_CMSCOMBINE_VERSION "bd4760a1" CACHE STRING "Version of CMSCombine" ) +set( STATANA_CMSCOMBINE_VERSION "b42ddbe7" CACHE STRING "Version of CMSCombine" ) option( TRACK_CHANGES "forces cmake to detect changes in directories of submodules and recompile if changes detected - slower to build, but required for development" ON) -- GitLab