Skip to content

Commit e06593f

Browse files
miquelnebotmiquelnebot
committed
Merge branch 'release/SBN2022B'
2 parents 7ccf1c9 + 26588cc commit e06593f

23 files changed

Lines changed: 625 additions & 285 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,16 @@
1111
# make install
1212
# make package (builds distribution tarfile)
1313
# ======================================================================
14-
15-
1614
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1715

18-
project(sbnobj VERSION 09.14.12 LANGUAGES CXX)
16+
find_package(cetmodules 3.20.00 REQUIRED)
17+
project(sbnobj VERSION 09.15.00 LANGUAGES CXX)
1918

2019
message(STATUS
2120
"\n-- ============================================================================="
2221
"\n-- === *** Start of configuration of ${PROJECT_NAME} ***"
2322
"\n-- ===")
2423

25-
# cetbuildtools contains our cmake modules
26-
find_package(cetbuildtools REQUIRED)
27-
28-
list(APPEND CMAKE_MODULE_PATH $ENV{CANVAS_ROOT_IO_DIR}/Modules)
2924

3025
include(CetCMakeEnv)
3126
cet_cmake_env()
@@ -37,18 +32,20 @@ cet_set_compiler_flags(DIAGS CAUTIOUS
3732
EXTRA_CXX_FLAGS -Wno-unused-local-typedefs
3833
)
3934

40-
cet_report_compiler_flags()
35+
cet_report_compiler_flags(REPORT_THRESHOLD VERBOSE)
4136

4237
# these are minimum required versions, not the actual product versions
43-
find_ups_product( canvas )
44-
find_ups_product( larcoreobj )
45-
find_ups_product( lardataobj )
46-
find_ups_product( larcorealg )
47-
find_ups_product( lardataalg )
48-
find_ups_product( nusimdata )
49-
find_ups_product(clhep)
50-
find_ups_boost( )
51-
find_ups_root()
38+
find_package( messagefacility REQUIRED )
39+
find_package( canvas REQUIRED )
40+
find_package( larcoreobj REQUIRED )
41+
find_package( lardataobj REQUIRED )
42+
find_package( larcorealg REQUIRED )
43+
find_package( lardataalg REQUIRED )
44+
find_package( nusimdata REQUIRED )
45+
find_package( Boost COMPONENTS system )
46+
find_package( ROOT REQUIRED )
47+
find_package( CLHEP REQUIRED )
48+
find_package( dk2nudata REQUIRED )
5249

5350
# macros for dictionary and simple_plugin
5451
include(ArtDictionary)
@@ -65,10 +62,8 @@ add_subdirectory(test)
6562

6663
# ups - table and config files
6764
# must be AFTER all other subdirectories
68-
add_subdirectory(ups)
6965

7066
# packaging utility - must be last
71-
include(UseCPack)
7267

7368

7469
message(STATUS
@@ -77,3 +72,4 @@ message(STATUS
7772
"\n-- ============================================================================="
7873
"\n-- "
7974
)
75+
cet_cmake_config()

‎sbnobj/Common/Analysis/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
cet_make(
1+
cet_make(
22
LIBRARIES
33
cetlib_except::cetlib_except
44
NO_DICTIONARY
55
)
66

7-
art_dictionary(DICTIONARY_LIBRARIES sbnobj_Common_Analysis)
7+
art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_Analysis)
88

99
install_headers()
1010
install_source()

‎sbnobj/Common/CRT/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
cet_make(
1+
cet_make(
22
LIBRARIES
33
cetlib_except::cetlib_except
4+
lardataobj::Simulation
45
NO_DICTIONARY
56
)
67

7-
art_dictionary(DICTIONARY_LIBRARIES sbnobj_Common_CRT)
8+
art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_CRT)
89

910
install_headers()
1011
install_source()

‎sbnobj/Common/EventGen/MeVPrtl/CMakeLists.txt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
cet_make(
1+
2+
cet_make(
23
LIBRARIES
34
cetlib_except::cetlib_except
4-
${ROOT_BASIC_LIB_LIST}
5+
nusimdata::SimulationBase
6+
dk2nu::Tree
57
NO_DICTIONARY
68
)
79

8-
art_dictionary(DICTIONARY_LIBRARIES sbnobj_Common_EventGen_MeVPrtl)
10+
art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_EventGen_MeVPrtl nusimdata::SimulationBase)
911

1012
install_headers()
1113
install_source()

‎sbnobj/Common/PMT/Data/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
cet_make(
22
LIBRARIES
3+
lardataobj::RawData
34
NO_DICTIONARY
45
)
56

6-
art_dictionary(DICTIONARY_LIBRARIES sbnobj_Common_PMT_Data)
7+
art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_PMT_Data)
78

89
install_headers()
910
install_source()

‎sbnobj/Common/POTAccounting/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
cet_make(
1+
cet_make(
22
LIBRARIES
33
cetlib_except::cetlib_except
4-
${ROOT_BASIC_LIB_LIST}
4+
ROOT::Core
55
NO_DICTIONARY
66
)
77

‎sbnobj/Common/Reco/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
cet_make(
1+
cet_make(
22
LIBRARIES
33
cetlib_except::cetlib_except
44
messagefacility::MF_MessageLogger
5-
${ROOT_BASIC_LIB_LIST}
5+
larcorealg::Geometry
6+
lardataobj::AnalysisBase
67
NO_DICTIONARY
78
)
89

9-
art_dictionary(DICTIONARY_LIBRARIES sbnobj_Common_Reco)
10+
art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_Reco)
1011

1112
install_headers()
1213
install_source()

‎sbnobj/Common/SBNEventWeight/CMakeLists.txt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
cet_make(
1+
cet_make(
22
NO_DICTIONARY
33
LIBRARIES
44
cetlib_except::cetlib_except
5-
${ROOT_BASIC_LIB_LIST}
5+
ROOT::Matrix
6+
ROOT::Core
67
CLHEP::CLHEP
7-
##art::Framework_Services_Registry
8-
##art::Framework_Services_Optional_RandomNumberGenerator_service
8+
nusimdata::SimulationBase
9+
dk2nu::Tree
910
)
1011

11-
art_dictionary(DICTIONARY_LIBRARIES sbnobj_Common_SBNEventWeight)
12+
art_dictionary(DICTIONARY_LIBRARIES sbnobj::Common_SBNEventWeight)
1213

1314
install_headers()
1415
install_source()

‎sbnobj/Common/Trigger/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cet_make(
22
LIBRARIES
3-
${ROOT_BASIC_LIB_LIST}
3+
ROOT::Core
44
NO_DICTIONARY
55
)
66

‎sbnobj/ICARUS/CRT/CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
cet_make(
1+
cet_make(
22
LIBRARIES
33
cetlib_except::cetlib_except
4+
lardataobj::Simulation
45
NO_DICTIONARY
56
)
67

7-
art_dictionary(DICTIONARY_LIBRARIES sbnobj_ICARUS_CRT)
8+
art_dictionary(DICTIONARY_LIBRARIES sbnobj::ICARUS_CRT)
89

910
install_headers()
1011
install_source()

0 commit comments

Comments
 (0)