Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Gaudi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gaudi
Gaudi
Commits
0f07e1b6
Commit
0f07e1b6
authored
3 years ago
by
Marco Clemencic
Browse files
Options
Downloads
Patches
Plain Diff
Fix CMake 3.20 policy CMP0116 warning
parent
903647ab
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1211
Minor fixes
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
cmake/GaudiToolbox.cmake
+10
-1
10 additions, 1 deletion
cmake/GaudiToolbox.cmake
with
10 additions
and
1 deletion
cmake/GaudiToolbox.cmake
+
10
−
1
View file @
0f07e1b6
...
...
@@ -699,7 +699,13 @@ function(gaudi_add_dictionary dictionary)
if
(
TARGET Python::Interpreter
AND
(
CMAKE_GENERATOR MATCHES
"Ninja"
OR
(
CMAKE_GENERATOR MATCHES
"Makefile"
AND CMAKE_VERSION VERSION_GREATER_EQUAL
"3.20"
)))
file
(
RELATIVE_PATH dep_target
"
${
PROJECT_BINARY_DIR
}
"
"
${
gensrcdict
}
"
)
if
(
POLICY CMP0116
)
cmake_policy
(
PUSH
)
cmake_policy
(
SET CMP0116 NEW
)
file
(
RELATIVE_PATH dep_target
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
"
${
gensrcdict
}
"
)
else
()
file
(
RELATIVE_PATH dep_target
"
${
PROJECT_BINARY_DIR
}
"
"
${
gensrcdict
}
"
)
endif
()
add_custom_command
(
OUTPUT
${
gensrcdict
}
${
rootmapname
}
${
pcmfile
}
COMMAND run
${
ROOT_genreflex_CMD
}
# comes from ROOTConfig.cmake
...
...
@@ -723,6 +729,9 @@ function(gaudi_add_dictionary dictionary)
COMMENT
"Generating
${
dictionary
}
.cxx and
${
dictionary
}
.rootmap and
${
dictionary
}
_rdict.pcm"
COMMAND_EXPAND_LISTS
${
job_pool
}
)
if
(
POLICY CMP0116
)
cmake_policy
(
POP
)
endif
()
else
()
if
(
NOT _root_dicts_deps_warning
)
message
(
WARNING
"dependencies of ROOT dictionaries are not complete, this feature needs a Ninja generator of CMake >= 3.20"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment