Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
122c20a7
Commit
122c20a7
authored
Mar 24, 2020
by
Simon Spannagel
Committed by
Jens Kroeger
Apr 02, 2020
Browse files
CMake: allow legacy C++ standard names
(cherry picked from commit
e9d5cc08
)
parent
c6e35c87
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
122c20a7
...
@@ -129,11 +129,11 @@ IF(NOT ROOT_FOUND)
...
@@ -129,11 +129,11 @@ IF(NOT ROOT_FOUND)
ENDIF
()
ENDIF
()
# Downgrade to C++14 if ROOT is not build with C++17 support
# 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
)
IF
(
NOT SUPPORT_STD_CXX17
)
MESSAGE
(
FATAL_ERROR
"ROOT was built with C++17 support but current compiler doesn't support it"
)
MESSAGE
(
FATAL_ERROR
"ROOT was built with C++17 support but current compiler doesn't support it"
)
ENDIF
()
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
)
SET
(
CMAKE_CXX_STANDARD 14
)
ELSEIF
(
ROOT_CXX_FLAGS MATCHES
".*std=c
\\
+
\\
+.*"
)
ELSEIF
(
ROOT_CXX_FLAGS MATCHES
".*std=c
\\
+
\\
+.*"
)
MESSAGE
(
FATAL_ERROR
"ROOT was built with an unsupported C++ version:
${
ROOT_CXX_FLAGS
}
"
)
MESSAGE
(
FATAL_ERROR
"ROOT was built with an unsupported C++ version:
${
ROOT_CXX_FLAGS
}
"
)
...
...
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