Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bill Hoffman
CMake
Commits
e109dc0b
Commit
e109dc0b
authored
Jul 12, 2018
by
Brad King
Browse files
Merge branch 'intel-std-fix' into release-3.12
Merge-request: !2206
parents
384c3f9e
735e69f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Modules/Compiler/Intel-C.cmake
View file @
e109dc0b
...
...
@@ -25,8 +25,7 @@ else()
if
(
NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0
)
set
(
CMAKE_C11_STANDARD_COMPILE_OPTION
"-std=c11"
)
# todo: there is no gnu11 value supported; figure out what to do
set
(
CMAKE_C11_EXTENSION_COMPILE_OPTION
"-std=c11"
)
set
(
CMAKE_C11_EXTENSION_COMPILE_OPTION
"-std=gnu11"
)
endif
()
if
(
NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0
)
...
...
Modules/Compiler/Intel-CXX.cmake
View file @
e109dc0b
...
...
@@ -36,18 +36,21 @@ else()
if
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0.0
)
set
(
CMAKE_CXX17_STANDARD_COMPILE_OPTION
"-std=c++17"
)
# todo: there is no gnu++17 value supported; figure out what to do
set
(
CMAKE_CXX17_EXTENSION_COMPILE_OPTION
"-std=c++17"
)
set
(
CMAKE_CXX17_EXTENSION_COMPILE_OPTION
"-std=gnu++17"
)
endif
()
if
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.2
)
set
(
CMAKE_CXX14_STANDARD_COMPILE_OPTION
"-std=c++14"
)
# todo: there is no gnu++14 value supported; figure out what to do
set
(
CMAKE_CXX14_EXTENSION_COMPILE_OPTION
"-std=c++14"
)
elseif
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0
)
set
(
CMAKE_CXX14_STANDARD_COMPILE_OPTION
"-std=c++1y"
)
# todo: there is no gnu++14 value supported; figure out what to do
set
(
CMAKE_CXX14_EXTENSION_COMPILE_OPTION
"-std=c++1y"
)
endif
()
# Intel 15.0.2 accepts c++14 instead of c++1y, but not gnu++14
# instead of gnu++1y. Intel 17.0.0 accepts gnu++14 too.
if
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17.0
)
set
(
CMAKE_CXX14_EXTENSION_COMPILE_OPTION
"-std=gnu++14"
)
elseif
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0.0
)
set
(
CMAKE_CXX14_EXTENSION_COMPILE_OPTION
"-std=gnu++1y"
)
endif
()
if
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0
)
...
...
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