Skip to content
Snippets Groups Projects
Commit 175a916c authored by Will Buttinger's avatar Will Buttinger
Browse files

Update CMakeLists.txt - updating CMSCombine to an official repo branch

parent c6af6f7f
No related branches found
No related tags found
3 merge requests!323Update 0.4 with developments from main - particularly CMS Combine,!322Bring most developments in from Main branch (including CMS combine),!310Update CMakeLists.txt - updating CMSCombine to an official repo branch
......@@ -63,7 +63,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/scripts/motd.in ${CMAKE_BINARY_DIR}${C
configure_file( ${CMAKE_SOURCE_DIR}/cmake/scripts/motd.in ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/motd )
add_custom_target(StatAnalysis_motd ALL
COMMENT "Generating StatAnalysis motd ..."
DEPENDS Package_xRooFit Package_TRExFitter Package_RooFitExtensions Package_RooUnfold Package_workspaceCombiner Package_xmlAnaWSBuilder Package_quickFit Package_BootstrapGenerator Package_CommonStatTools
DEPENDS Package_xRooFit Package_TRExFitter Package_RooFitExtensions Package_RooUnfold Package_workspaceCombiner Package_xmlAnaWSBuilder Package_quickFit Package_BootstrapGenerator Package_CommonStatTools Package_CMSCombine
COMMAND ${CMAKE_COMMAND} -DOUTPUT_FILE=${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/motd.tmp2
-DINPUT_FILE=${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/motd.tmp1
-DBUILD_DIR=${CMAKE_BINARY_DIR}
......
......@@ -24,7 +24,7 @@ else()
set( _token "" )
endif()
set( STATANA_CMSCOMBINE_REPOSITORY "https://github.com/will-cern/HiggsAnalysis-CombinedLimit.git" CACHE STRING "Repository of cmscombine" )
set( STATANA_CMSCOMBINE_REPOSITORY "https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git" CACHE STRING "Repository of cmscombine" )
set( _buildDir ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMSCombineBuild )
......
......@@ -109,7 +109,7 @@ set( STATANA_ROOUNFOLD_VERSION "" CACHE STRING "Version of RooUnfold" )
set( STATANA_QUICKFIT_VERSION "a0e81c25" CACHE STRING "Version of quickFit" )
set( STATANA_WORKSPACECOMBINER_VERSION "" CACHE STRING "Version of workspaceCombiner" )
set( STATANA_XMLANAWSBUILDER_VERSION "ba8fda1a" CACHE STRING "Version of xmlAnaWSBuilder" )
set( STATANA_CMSCOMBINE_VERSION "statanalysis" CACHE STRING "Version of CMSCombine" )
set( STATANA_CMSCOMBINE_VERSION "dev_jlangfor_combinev10" 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)
......
......@@ -14,3 +14,4 @@ HistFitter : @STATANA_HISTFITTER_VERSION@ ${STATANA_HISTFITTER_DATE}
BootstrapGenerator : @STATANA_BOOTSTRAPGENERATOR_VERSION@ ${STATANA_BOOTSTRAPGENERATOR_DATE}
Significance : @STATANA_SIGNIFICANCE_VERSION@ ${STATANA_SIGNIFICANCE_DATE}
pyhf : @STATANA_PYHF_VERSION@
CMSCombine : @STATANA_CMSCOMBINE_VERSION@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment