Skip to content

Commit 5a71769

Browse files
committed
Fix RECC vs PCH interference
Precompiled headers are incompatible with recc because they embed the path to the original header in the .pch file. This goes against the idea that a given Action in the cache results in compatible byproducts.
1 parent 0b3a5c8 commit 5a71769

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

PWGJE/Tasks/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
add_library(JetSubstructureHFPCH OBJECT jetSubstructureHFPCH.cxx)
1212
target_link_libraries(JetSubstructureHFPCH
1313
PUBLIC O2::Framework O2Physics::PWGJECore O2Physics::AnalysisCore)
14+
if(NOT DEFINED ENV{USE_RECC})
1415
target_precompile_headers(JetSubstructureHFPCH PRIVATE
1516
[["PWGJE/DataModel/Jet.h"]]
1617
[["PWGJE/DataModel/JetSubstructure.h"]]
@@ -25,6 +26,7 @@ target_precompile_headers(JetSubstructureHFPCH PRIVATE
2526
<vector>
2627
<memory>
2728
)
29+
endif()
2830

2931
o2physics_add_dpl_workflow(emc-cellmonitor
3032
SOURCES emcCellMonitor.cxx

cmake/O2PhysicsAddWorkflow.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function(o2physics_add_dpl_workflow baseTargetName)
4747
set_property(TARGET ${targetExeName} PROPERTY JOB_POOL_COMPILE analysis)
4848
set_property(TARGET ${targetExeName} PROPERTY JOB_POOL_LINK analysis)
4949

50-
if(A_REUSE_FROM)
50+
if(A_REUSE_FROM AND NOT DEFINED ENV{USE_RECC})
5151
target_precompile_headers(${targetExeName} REUSE_FROM ${A_REUSE_FROM})
5252
endif()
5353

0 commit comments

Comments
 (0)