Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Corryvreckan FP Heidelberg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Ruben Kolb
Corryvreckan FP Heidelberg
Commits
e9d5cc08
Commit
e9d5cc08
authored
5 years ago
by
Simon Spannagel
Browse files
Options
Downloads
Patches
Plain Diff
CMake: allow legacy C++ standard names
parent
1f371066
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+2
-2
2 additions, 2 deletions
CMakeLists.txt
with
2 additions
and
2 deletions
CMakeLists.txt
+
2
−
2
View file @
e9d5cc08
...
...
@@ -129,11 +129,11 @@ IF(NOT ROOT_FOUND)
ENDIF
()
# Downgrade to C++14 if ROOT is not build with C++17 support
IF
(
ROOT_CXX_FLAGS MATCHES
".*std=c
\\
+
\\
+1
7
.*"
)
IF
(
ROOT_CXX_FLAGS MATCHES
".*std=c
\\
+
\\
+1
[7z]
.*"
)
IF
(
NOT SUPPORT_STD_CXX17
)
MESSAGE
(
FATAL_ERROR
"ROOT was built with C++17 support but current compiler doesn't support it"
)
ENDIF
()
ELSEIF
(
ROOT_CXX_FLAGS MATCHES
".*std=c
\\
+
\\
+1[14].*"
)
ELSEIF
(
ROOT_CXX_FLAGS MATCHES
".*std=c
\\
+
\\
+1[14
y
].*"
)
SET
(
CMAKE_CXX_STANDARD 14
)
ELSEIF
(
ROOT_CXX_FLAGS MATCHES
".*std=c
\\
+
\\
+.*"
)
MESSAGE
(
FATAL_ERROR
"ROOT was built with an unsupported C++ version:
${
ROOT_CXX_FLAGS
}
"
)
...
...
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