Skip to content

Commit 2ac21eb

Browse files
asanchezcastilloasanchezcastillo
authored
Merge branch 'develop' into feature/acastill_correctedopflash_update
2 parents c6a65a3 + 35baeab commit 2ac21eb

41 files changed

Lines changed: 771 additions & 624 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
1717

1818
find_package(cetmodules 3.20.00 REQUIRED)
19-
project(sbncode VERSION 10.21.00 LANGUAGES CXX)
19+
project(sbncode VERSION 10.22.00 LANGUAGES CXX)
2020

2121
message(STATUS "\n\n ========================== ${PROJECT_NAME} ==========================")
2222

‎CMakePresets.json‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
{
2+
"configurePresets" : [
3+
{
4+
"cacheVariables" : {
5+
"CMAKE_BUILD_TYPE" : {
6+
"type" : "STRING",
7+
"value" : "RelWithDebInfo"
8+
},
9+
"CMAKE_CXX_EXTENSIONS" : {
10+
"type" : "BOOL",
11+
"value" : "OFF"
12+
},
13+
"CMAKE_CXX_STANDARD_REQUIRED" : {
14+
"type" : "BOOL",
15+
"value" : "ON"
16+
},
17+
"sbncode_ADD_ARCH_DIRS_INIT" : {
18+
"type" : "INTERNAL",
19+
"value" : "LIBRARY_DIR;BIN_DIR"
20+
},
21+
"sbncode_ADD_NOARCH_DIRS_INIT" : {
22+
"type" : "INTERNAL",
23+
"value" : "GDML_DIR;INCLUDE_DIR;FHICL_DIR;FW_DIR"
24+
},
25+
"sbncode_BIN_DIR_INIT" : {
26+
"type" : "STRING",
27+
"value" : "bin"
28+
},
29+
"sbncode_FHICL_DIR_INIT" : {
30+
"type" : "STRING",
31+
"value" : "fcl"
32+
},
33+
"sbncode_FW_DIR_INIT" : {
34+
"type" : "STRING",
35+
"value" : "scripts"
36+
},
37+
"sbncode_INCLUDE_DIR_INIT" : {
38+
"type" : "STRING",
39+
"value" : "include"
40+
},
41+
"sbncode_LIBRARY_DIR_INIT" : {
42+
"type" : "STRING",
43+
"value" : "lib"
44+
}
45+
},
46+
"description" : "Configuration settings translated from ups/product_deps",
47+
"displayName" : "Configuration from product_deps",
48+
"hidden" : true,
49+
"name" : "from_product_deps"
50+
},
51+
{
52+
"cacheVariables" : {
53+
"CMAKE_CXX_COMPILER" : {
54+
"type" : "STRING",
55+
"value" : "$env{CETPKG_CXX_COMPILER}"
56+
},
57+
"CMAKE_CXX_STANDARD" : {
58+
"type" : "STRING",
59+
"value" : "$env{CETPKG_CXX_STANDARD}"
60+
},
61+
"CMAKE_C_COMPILER" : {
62+
"type" : "STRING",
63+
"value" : "$env{CETPKG_C_COMPILER}"
64+
},
65+
"CMAKE_Fortran_COMPILER" : {
66+
"type" : "STRING",
67+
"value" : "$env{CETPKG_Fortran_COMPILER}"
68+
},
69+
"UPS_CXX_COMPILER_ID" : {
70+
"type" : "STRING",
71+
"value" : "$env{CETPKG_CXX_COMPILER_ID}"
72+
},
73+
"UPS_CXX_COMPILER_VERSION" : {
74+
"type" : "STRING",
75+
"value" : "$env{CETPKG_CXX_COMPILER_VERSION}"
76+
},
77+
"UPS_C_COMPILER_ID" : {
78+
"type" : "STRING",
79+
"value" : "$env{CETPKG_C_COMPILER_ID}"
80+
},
81+
"UPS_C_COMPILER_VERSION" : {
82+
"type" : "STRING",
83+
"value" : "$env{CETPKG_C_COMPILER_VERSION}"
84+
},
85+
"UPS_Fortran_COMPILER_ID" : {
86+
"type" : "STRING",
87+
"value" : "$env{CETPKG_Fortran_COMPILER_ID}"
88+
},
89+
"UPS_Fortran_COMPILER_VERSION" : {
90+
"type" : "STRING",
91+
"value" : "$env{CETPKG_Fortran_COMPILER_VERSION}"
92+
},
93+
"WANT_UPS" : {
94+
"type" : "BOOL",
95+
"value" : true
96+
},
97+
"sbncode_EXEC_PREFIX_INIT" : {
98+
"type" : "STRING",
99+
"value" : "$env{CETPKG_FQ_DIR}"
100+
},
101+
"sbncode_UPS_BUILD_ONLY_DEPENDENCIES_INIT" : {
102+
"type" : "STRING",
103+
"value" : "cetmodules"
104+
},
105+
"sbncode_UPS_PRODUCT_FLAVOR_INIT" : {
106+
"type" : "STRING",
107+
"value" : "$env{CETPKG_FLAVOR}"
108+
},
109+
"sbncode_UPS_PRODUCT_NAME_INIT" : {
110+
"type" : "STRING",
111+
"value" : "sbncode"
112+
},
113+
"sbncode_UPS_QUALIFIER_STRING_INIT" : {
114+
"type" : "STRING",
115+
"value" : "$env{CETPKG_QUALSPEC}"
116+
}
117+
},
118+
"description" : "Extra configuration for UPS package generation",
119+
"displayName" : "UPS extra configuration",
120+
"hidden" : true,
121+
"name" : "extra_for_UPS"
122+
},
123+
{
124+
"description" : "Default configuration including settings from ups/product_deps",
125+
"displayName" : "Default configuration",
126+
"inherits" : "from_product_deps",
127+
"name" : "default"
128+
},
129+
{
130+
"description" : "Default configuration for UPS package generation",
131+
"displayName" : "Default configuration for UPS",
132+
"inherits" : [
133+
"default",
134+
"extra_for_UPS"
135+
],
136+
"name" : "for_UPS"
137+
}
138+
],
139+
"version" : 3
140+
}

‎sbncode/BeamSpillInfoRetriever/ICARUSBNBEXTRetriever/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
cet_build_plugin(ICARUSBNBEXTRetriever art::module
3-
LIBRARIES
3+
LIBRARIES PRIVATE
44
art::Persistency_Common
55
art::Utilities canvas::canvas
66
cetlib::cetlib cetlib_except::cetlib_except

‎sbncode/BeamSpillInfoRetriever/ICARUSBNBRetriever/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ find_package(ifbeam)
22
find_package(ifdh_art)
33

44
cet_build_plugin(ICARUSBNBRetriever art::module
5-
LIBRARIES
5+
LIBRARIES PRIVATE
66
sbn_POTTools
77
sbn_getFOM
88
SQLite::SQLite3

‎sbncode/BeamSpillInfoRetriever/NuMIEXTRetriever/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
cet_build_plugin(NuMIEXTRetriever art::module
3-
LIBRARIES
3+
LIBRARIES PRIVATE
44
art::Persistency_Common
55
art::Utilities canvas::canvas
66
cetlib::cetlib cetlib_except::cetlib_except

‎sbncode/BeamSpillInfoRetriever/NuMIRetriever/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ find_package(ifbeam)
22
find_package(ifdh_art)
33

44
cet_build_plugin(NuMIRetriever art::module
5-
LIBRARIES
5+
LIBRARIES PRIVATE
66
art::Persistency_Common
77
art::Utilities canvas::canvas
88
cetlib::cetlib cetlib_except::cetlib_except

‎sbncode/BeamSpillInfoRetriever/SBNDBNBEXTRetriever/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ find_package(ifbeam)
22
find_package(ifdh_art)
33

44
cet_build_plugin(SBNDBNBEXTRetriever art::module
5-
LIBRARIES
5+
LIBRARIES PRIVATE
66
sbn_POTTools
77
)
88

‎sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ find_package(ifbeam)
22
find_package(ifdh_art)
33

44
cet_build_plugin(SBNDBNBRetriever art::module
5-
LIBRARIES
5+
LIBRARIES PRIVATE
66
sbn_POTTools
77
sbn_getFOM
88
)

‎sbncode/BeamSpillInfoRetriever/SBNDBNBZEROBIASRetriever/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ find_package(ifbeam)
22
find_package(ifdh_art)
33

44
cet_build_plugin(SBNDBNBZEROBIASRetriever art::module
5-
LIBRARIES
5+
LIBRARIES PRIVATE
66
sbn_POTTools
77
sbn_getFOM
88
)

‎sbncode/CAFMaker/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ art_make_library( LIBRARY_NAME sbncode_CAFMaker
5656
)
5757

5858
cet_build_plugin ( CAFMaker art::module
59-
LIBRARIES
59+
LIBRARIES PRIVATE
6060
sbncode_CAFMaker
6161
sbnanaobj::StandardRecord
6262
larcorealg::Geometry

0 commit comments

Comments
 (0)