[Cmake-commits] CMake branch, next, updated. v3.6.1-1063-g55c3ee1
Ben Boeckel
ben.boeckel at kitware.com
Tue Aug 2 15:13:48 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 55c3ee103dcac6bc4659993deee069b53bcc008b (commit)
via 088f14eb725650158d256c28e86e44da3989ad9c (commit)
via 27a3ca15e5e92abbdf9228a5ac83c190a5caf0a8 (commit)
via cc223e1eed69775a323a59628ad93fc79390c2f2 (commit)
from 57addbd3e72f7f16595ba2245a12da9eeac12535 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55c3ee103dcac6bc4659993deee069b53bcc008b
commit 55c3ee103dcac6bc4659993deee069b53bcc008b
Merge: 57addbd 088f14e
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Aug 2 15:13:46 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 15:13:46 2016 -0400
Merge topic 'intel-gnu11-support' into next
088f14eb Intel-C: standard flags are also supported in 12.0
27a3ca15 Intel-C: support gnu89 and gnu99 extension flags
cc223e1e Intel-C: declare support for gnu11
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=088f14eb725650158d256c28e86e44da3989ad9c
commit 088f14eb725650158d256c28e86e44da3989ad9c
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Aug 2 13:10:56 2016 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Aug 2 13:10:56 2016 -0400
Intel-C: standard flags are also supported in 12.0
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index 0efcbc2..edca154 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -19,7 +19,7 @@ if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_C11_EXTENSION_COMPILE_OPTION "${_std}=gnu11")
endif()
-if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
+if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)
set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27a3ca15e5e92abbdf9228a5ac83c190a5caf0a8
commit 27a3ca15e5e92abbdf9228a5ac83c190a5caf0a8
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Aug 2 13:10:30 2016 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Aug 2 13:10:41 2016 -0400
Intel-C: support gnu89 and gnu99 extension flags
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index b2ff50d..0efcbc2 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -21,9 +21,9 @@ endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
set(CMAKE_C90_STANDARD_COMPILE_OPTION "${_std}=c89")
- set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=c89")
+ set(CMAKE_C90_EXTENSION_COMPILE_OPTION "${_std}=gnu89")
set(CMAKE_C99_STANDARD_COMPILE_OPTION "${_std}=c99")
- set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=c99")
+ set(CMAKE_C99_EXTENSION_COMPILE_OPTION "${_std}=gnu99")
endif()
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.1)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc223e1eed69775a323a59628ad93fc79390c2f2
commit cc223e1eed69775a323a59628ad93fc79390c2f2
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Aug 2 11:31:50 2016 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Aug 2 11:42:45 2016 -0400
Intel-C: declare support for gnu11
Without extensions, functions like `strdup` are not available since they
are actually controlled by feature flags such as _SVID_SOURCE and
_BSD_SOURCE. When using `-std=c11` on Intel, none of these flags are
set, so the functions are not declared properly leading to compile
errors.
Reported-by: Adam J. Stewart <ajstewart426 at gmail.com>
Closes: #16226
diff --git a/Modules/Compiler/Intel-C.cmake b/Modules/Compiler/Intel-C.cmake
index eb9602a..b2ff50d 100644
--- a/Modules/Compiler/Intel-C.cmake
+++ b/Modules/Compiler/Intel-C.cmake
@@ -16,7 +16,7 @@ endif()
if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0.0)
set(CMAKE_C11_STANDARD_COMPILE_OPTION "${_std}=c11")
- 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.1)
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Intel-C.cmake | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list