Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LHCb
Rec
Commits
08f3ad20
Commit
08f3ad20
authored
Mar 30, 2022
by
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
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Phys/FunctorCore/CMakeLists.txt
View file @
08f3ad20
...
...
@@ -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
}
"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment