[Cmake-commits] CMake branch, next, updated. v2.8.9-577-ge56136c
Brad King
brad.king at kitware.com
Tue Sep 18 07:49:54 EDT 2012
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 e56136c280ddb00a0d64dd117547156f782c0314 (commit)
via 011d5a4b4704c745dcd1b5ae8bf58b7a14df30db (commit)
via 70169ec1bfa5adc4bc99c1777f44c6f8446bba04 (commit)
via 4824633642bbaacf6c5b7b36e131e2463d7c2f68 (commit)
from 38506121bbbcdbbf0b5a98cb8595f785c6c60585 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e56136c280ddb00a0d64dd117547156f782c0314
commit e56136c280ddb00a0d64dd117547156f782c0314
Merge: 3850612 011d5a4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 18 07:49:51 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 18 07:49:51 2012 -0400
Merge topic 'osx-clang-target-flags' into next
011d5a4 OS X: Add platform-specific Clang compiler info files (#13536)
70169ec CMake Nightly Date Stamp
4824633 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=011d5a4b4704c745dcd1b5ae8bf58b7a14df30db
commit 011d5a4b4704c745dcd1b5ae8bf58b7a14df30db
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 17 15:34:50 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 17 15:36:41 2012 -0400
OS X: Add platform-specific Clang compiler info files (#13536)
Clang has the same interface as GNU except that we do not need to test
for the deployment target and sysroot flags. Simply set variables
CMAKE_${lang}_HAS_ISYSROOT
CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG
to true because every version of Clang available on OS X supports these
flags.
diff --git a/Modules/Platform/Darwin-Clang-C.cmake b/Modules/Platform/Darwin-Clang-C.cmake
new file mode 100644
index 0000000..0a1502e
--- /dev/null
+++ b/Modules/Platform/Darwin-Clang-C.cmake
@@ -0,0 +1,2 @@
+include(Platform/Darwin-Clang)
+__darwin_compiler_clang(C)
diff --git a/Modules/Platform/Darwin-Clang-CXX.cmake b/Modules/Platform/Darwin-Clang-CXX.cmake
new file mode 100644
index 0000000..f8e8d88
--- /dev/null
+++ b/Modules/Platform/Darwin-Clang-CXX.cmake
@@ -0,0 +1,2 @@
+include(Platform/Darwin-Clang)
+__darwin_compiler_clang(CXX)
diff --git a/Modules/Platform/Darwin-Clang.cmake b/Modules/Platform/Darwin-Clang.cmake
new file mode 100644
index 0000000..46f06f7
--- /dev/null
+++ b/Modules/Platform/Darwin-Clang.cmake
@@ -0,0 +1,26 @@
+
+#=============================================================================
+# Copyright 2002-2012 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+# This module is shared by multiple languages; use include blocker.
+if(__DARWIN_COMPILER_CLANG)
+ return()
+endif()
+set(__DARWIN_COMPILER_CLANG 1)
+
+macro(__darwin_compiler_clang lang)
+ set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-dynamiclib -Wl,-headerpad_max_install_names")
+ set(CMAKE_SHARED_MODULE_CREATE_${lang}_FLAGS "-bundle -Wl,-headerpad_max_install_names")
+ set(CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG "-mmacosx-version-min=")
+ set(CMAKE_${lang}_HAS_ISYSROOT 1)
+endmacro()
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Darwin-Clang-C.cmake | 2 ++
Modules/Platform/Darwin-Clang-CXX.cmake | 2 ++
.../{Linux-PGI.cmake => Darwin-Clang.cmake} | 17 ++++++++---------
Source/CMakeVersion.cmake | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
create mode 100644 Modules/Platform/Darwin-Clang-C.cmake
create mode 100644 Modules/Platform/Darwin-Clang-CXX.cmake
copy Modules/Platform/{Linux-PGI.cmake => Darwin-Clang.cmake} (61%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list