[Cmake-commits] CMake branch, next, updated. v2.8.10.1-822-g9720238

[Brad King]

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  97202381c5dd202a1d62b549061482d358b66175 (commit)
       via  720d790f16fccb92983010581034a19a0a1ce5d5 (commit)
      from  58dd714f1160bc05f82c9083cd5a37d0d6544071 (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=97202381c5dd202a1d62b549061482d358b66175
commit 97202381c5dd202a1d62b549061482d358b66175
Merge: 58dd714 720d790
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 8 09:22:00 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 8 09:22:00 2012 -0500

    Merge topic 'osx-bad-sdk-xcode-3.2.6' into next
    
    720d790 OS X: Warn about known SDK breakage by Xcode 3.2.6


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=720d790f16fccb92983010581034a19a0a1ce5d5
commit 720d790f16fccb92983010581034a19a0a1ce5d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 8 09:06:07 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 8 09:18:59 2012 -0500

    OS X: Warn about known SDK breakage by Xcode 3.2.6
    
    Xcode 3.2.6 is known to break the SDK Library/Frameworks layout.
    Detect and warn about this case to tell users to fix their system.
    
    Reported-by: Matthew Brett <matthew.brett at gmail.com>

diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index 4e7e99c..ed0b8af 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -263,6 +263,23 @@ set(CMAKE_SYSTEM_FRAMEWORK_PATH
   /Network/Library/Frameworks
   /System/Library/Frameworks)
 
+# Warn about known system mis-configuration case.
+if(CMAKE_OSX_SYSROOT)
+  get_property(_IN_TC GLOBAL PROPERTY IN_TRY_COMPILE)
+  if(NOT _IN_TC AND
+     NOT IS_SYMLINK "${CMAKE_OSX_SYSROOT}/Library/Frameworks"
+     AND IS_SYMLINK "${CMAKE_OSX_SYSROOT}/Library/Frameworks/Frameworks")
+    message(WARNING "The SDK Library/Frameworks path\n"
+      " ${CMAKE_OSX_SYSROOT}/Library/Frameworks\n"
+      "is not set up correctly on this system.  "
+      "This is known to occur when installing Xcode 3.2.6:\n"
+      " http://bugs.python.org/issue14018\n"
+      "The problem may cause build errors that report missing system frameworks.  "
+      "Fix your SDK symlinks to resolve this issue and avoid this warning."
+      )
+  endif()
+endif()
+
 # default to searching for application bundles first
 if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
   set(CMAKE_FIND_APPBUNDLE FIRST)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Darwin.cmake |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake