[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-53-gc4e3666
Gregor Jasny
gjasny at googlemail.com
Sun Feb 7 14:42:33 EST 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 c4e3666047f50c16673ab70c66b57046995052b5 (commit)
via 2cae5128fdc6316a7f0913cb89ec467b33b9715b (commit)
via c8100794b4faab4255c1229f966f57525c18ccc7 (commit)
via d276b6e9971a3f4d0a99c6e46ebb0533fbeee5db (commit)
from b11b9d05dd1d9e77ac76f6b9b72c4f1face53418 (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=c4e3666047f50c16673ab70c66b57046995052b5
commit c4e3666047f50c16673ab70c66b57046995052b5
Merge: b11b9d0 2cae512
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Feb 7 14:42:32 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 7 14:42:32 2016 -0500
Merge topic 'apple-isystem-gcc' into next
2cae5128 Apple: Enable -isystem for GNU Compiler >= 4 (#15953)
c8100794 CMake Nightly Date Stamp
d276b6e9 CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cae5128fdc6316a7f0913cb89ec467b33b9715b
commit 2cae5128fdc6316a7f0913cb89ec467b33b9715b
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Feb 7 20:20:02 2016 +0100
Commit: Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Feb 7 20:20:02 2016 +0100
Apple: Enable -isystem for GNU Compiler >= 4 (#15953)
Due to #4662 -isystem support was disabled for all GNU Compilers
on Apple platforms. But the change was probably a just work around
for a broken compiler on Tiger (see 10837#c27206). So we tighten
the condition to only kick in for GCC versions earlier than 4.
That should ensure sane behavior for Xcode 3.2 and later.
diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake
index 764fbf9..d1ca85e 100644
--- a/Modules/Compiler/GNU.cmake
+++ b/Modules/Compiler/GNU.cmake
@@ -52,7 +52,7 @@ macro(__compiler_gnu lang)
set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG")
set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE "<CMAKE_${lang}_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
- if(NOT APPLE)
+ if(NOT APPLE OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4) # work around #4462
set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ")
endif()
endmacro()
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/GNU.cmake | 2 +-
Source/CMakeVersion.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list