Skip to content

Commit f85bdb7

Browse files
authored
Merge branch 'AliceO2Group:master' into LambdaPolRing-v3
2 parents bbbc91d + f2f81d6 commit f85bdb7

18 files changed

Lines changed: 3118 additions & 1227 deletions

.clang-tidy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ WarningsAsErrors: >-
111111
*,
112112
-readability-braces-around-statements,
113113
-readability-suspicious-call-argument,
114+
-modernize-*,
115+
-readability-*,
114116
CheckOptions:
115117
modernize-avoid-c-arrays.AllowStringArrays: true
116118
# Common tolerated conversions

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
# granted to it by virtue of its status as an Intergovernmental Organization
1010
# or submit itself to any jurisdiction.
1111

12-
cmake_minimum_required(VERSION 3.23 FATAL_ERROR)
12+
# 3.27 for $<COMPILE_ONLY:>, which O2PhysicsAddWorkflow.cmake uses to give a
13+
# workflow the precompiled header carrier's compile usage requirements without
14+
# also putting it on the link line. Builds use CMake 4.1 (alidist cmake.sh).
15+
cmake_minimum_required(VERSION 3.27 FATAL_ERROR)
1316

1417
project(O2Physics
1518
VERSION 0.0.1

Common/Core/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@ o2physics_add_library(AnalysisCore
3030
# Skipped under recc, which caches compilations remotely instead -- the two do
3131
# not combine, as a PCH is a local artefact of one compiler invocation.
3232
#
33-
# The link libraries have to match what the reusing targets compile with, so
34-
# this carries only what every workflow already links.
33+
# The reusing targets must compile with the same preprocessor state as this
34+
# carrier, which does not follow from the link list: AnalysisCore reaches
35+
# O2::rANS and its INTERFACE -DRANS_ENABLE_JSON, whereas a bare workflow links
36+
# only O2::Framework. o2physics_add_dpl_workflow therefore copies this target's
37+
# compile definitions onto every consumer; keep that in mind when changing what
38+
# is linked here.
3539
add_library(AnalysisPCH OBJECT analysisPCH.cxx)
3640
target_link_libraries(AnalysisPCH PUBLIC O2::Framework O2Physics::AnalysisCore)
3741
if(NOT DEFINED ENV{USE_RECC})

0 commit comments

Comments
 (0)