Commit 08f3ad20 authored by Rosen Matev's avatar Rosen Matev
Browse files

Merge branch 'rm-follow-2699' into 'master'

Fix functor cache for release builds (follow up !2699)

See merge request !2829
parents 56b698c2 bcd2057c
Pipeline #3783184 passed with stage
in 24 seconds
......@@ -117,6 +117,15 @@ lhcb_env(PRIVATE SET
# # generate temporary file because I don't want to waste more time tyring to
# figure out how to freaking handle stupid whitespace in generator expressions
# and lists
#
# Includes are split into user (-I) and system (-isystem) according to the usual
# way our cmake splits them (only includes from the current project are -I).
# FIXME Have upstream projects use -I, see https://gitlab.cern.ch/lhcb/LHCb/-/issues/191
# FIXME In a super-project build, includes from other projects will be isystem
# (unlike for any other compilation unit).
# FIXME for some reason, dd4hep has /usr/include in its include directories. because we
# include these directories with -isystem, we trigger https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129.
# Thus, explicitly exclude /usr/include
file(GENERATE
OUTPUT "tmp_preprocessor.sh"
CONTENT "# auto generated
......@@ -124,8 +133,8 @@ exec ${CMAKE_CXX_COMPILER} -x c++ -std=c++${GAUDI_CXX_STANDARD} \
-D$<JOIN:$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:TestFunctors,COMPILE_DEFINITIONS>>, -D> \
${CMAKE_CXX_FLAGS} \
${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPER}} \
-I$<JOIN:$<FILTER:$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:FunctorCoreLib,INCLUDE_DIRECTORIES>>,INCLUDE,/Rec/>, -I> \
-isystem $<JOIN:$<FILTER:$<FILTER:$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:FunctorCoreLib,INCLUDE_DIRECTORIES>>,EXCLUDE,/usr/include>,EXCLUDE,/Rec/>, -isystem > \
-I$<JOIN:$<FILTER:$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:FunctorCoreLib,INCLUDE_DIRECTORIES>>,INCLUDE,^${PROJECT_SOURCE_DIR}>, -I> \
-isystem $<JOIN:$<FILTER:$<FILTER:$<REMOVE_DUPLICATES:$<TARGET_PROPERTY:FunctorCoreLib,INCLUDE_DIRECTORIES>>,EXCLUDE,/usr/include>,EXCLUDE,^${PROJECT_SOURCE_DIR}>, -isystem > \
-E ${CMAKE_CURRENT_SOURCE_DIR}/include/Functors/JIT_includes.h \
-o ${preprocessed_header_name}"
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment