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 9e21a254790a6998010de0ac969a16d863a09182 (commit)
via 63c4133b38f665bcf77bd92c08cbdc2e7ebee178 (commit)
from de5a90b6c84830d69b73e06a35e9c40330184f38 (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=9e21a254790a6998010de0ac969a16d863a09182
commit 9e21a254790a6998010de0ac969a16d863a09182
Merge: de5a90b 63c4133
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 9 08:38:21 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Mar 9 08:38:21 2016 -0500
Merge topic 'clang-iframework-version' into next
63c4133b OS X: Use -iframework with Clang only on version >= 3.2
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63c4133b38f665bcf77bd92c08cbdc2e7ebee178
commit 63c4133b38f665bcf77bd92c08cbdc2e7ebee178
Author: Jean-Christophe Fillion-Robin <jchris.filli...@kitware.com>
AuthorDate: Wed Mar 9 00:50:21 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 9 08:37:29 2016 -0500
OS X: Use -iframework with Clang only on version >= 3.2
Since commit v3.1.0-rc1~564^2 (OS X: Use -iframework for system
framework directories, 2014-05-05) we test the version of Clang is smaller
that 3.1 to see if it supports -iframework.
Considering that "iframework" support has been added in clang@r142418
(Frontend: Support -iframework.) prior to clang 3.1, this made sense.
That said, considering that support for multiple -iframework parameters
has been added later in clang@r164607 (-iframework should allow separate
arguments. ) prior to clang 3.2, this commit updates the check to enable
framework support only if version is >= 3.2
diff --git a/Modules/Platform/Darwin-Clang.cmake
b/Modules/Platform/Darwin-Clang.cmake
index 4cded47..61a5e0c 100644
--- a/Modules/Platform/Darwin-Clang.cmake
+++ b/Modules/Platform/Darwin-Clang.cmake
@@ -24,7 +24,7 @@ macro(__darwin_compiler_clang lang)
set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle
-Wl,-headerpad_max_install_names")
set(CMAKE_${lang}_SYSROOT_FLAG "-isysroot")
set(CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG "-mmacosx-version-min=")
- if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.1)
+ if(NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 3.2)
set(CMAKE_${lang}_SYSTEM_FRAMEWORK_SEARCH_FLAG "-iframework ")
endif()
endmacro()
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Darwin-Clang.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
