Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
e9d5cc08
Commit
e9d5cc08
authored
Mar 24, 2020
by
Simon Spannagel
Browse files
CMake: allow legacy C++ standard names
parent
1f371066
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
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
}
"
)
...
...
Simon Spannagel
@simonspa
mentioned in commit
122c20a7
·
Jun 18, 2020
mentioned in commit
122c20a7
mentioned in commit 122c20a71db7eb3db39ca11cfb1bcea20160009e
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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