Skip to content

Commit

Permalink
Merge branch 'hotfix/v3_14_02' into v3/v3_14-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
greenc-FNAL committed Dec 13, 2023
2 parents 10dcd5d + 3424e22 commit 49c0fd5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)

find_package(cetmodules 2.13.00 REQUIRED)
project(art VERSION 3.14.01 LANGUAGES CXX C)
project(art VERSION 3.14.02 LANGUAGES CXX C)

include(CetCMakeEnv)
cet_cmake_env()
Expand Down
29 changes: 15 additions & 14 deletions ups/product_deps
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ perllib product_dir
#
####################################
product version qual flags <table_format=2>
canvas v3_16_01 -
canvas v3_16_02
hep_concurrency v1_09_02
catch v3_3_2 - only_for_build
cetmodules v3_22_02 - only_for_build
range v3_0_12_0 - only_for_build
Expand Down Expand Up @@ -306,19 +307,19 @@ end_product_list
# case it is optional.
#
####################################
qualifier catch canvas notes
c14:debug c14 c14:debug
c14:prof c14 c14:prof
c15:debug c15 c15:debug
c15:prof c15 c15:prof
e20:debug e20 e20:debug
e20:prof e20 e20:prof
e26:debug e26 e26:debug
e26:prof e26 e26:prof
e27:debug e27 e27:debug
e27:prof e27 e27:prof
e28:debug e28 e28:debug
e28:prof e28 e28:prof
qualifier catch hep_concurrency canvas notes
c14:debug c14 c14:debug c14:debug
c14:prof c14 c14:prof c14:prof
c15:debug c15 c15:debug c15:debug
c15:prof c15 c15:prof c15:prof
e20:debug e20 e20:debug e20:debug
e20:prof e20 e20:prof e20:prof
e26:debug e26 e26:debug e26:debug
e26:prof e26 e26:prof e26:prof
e27:debug e27 e27:debug e27:debug
e27:prof e27 e27:prof e27:prof
e28:debug e28 e28:debug e28:debug
e28:prof e28 e28:prof e28:prof
end_qualifier_list
####################################

Expand Down

0 comments on commit 49c0fd5

Please sign in to comment.