[Cmake-commits] CMake branch, next, updated. v2.8.4-1886-gc77331b

[David Cole]

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  c77331b48476b0421b9ff76d1681b908208c6b06 (commit)
       via  c050c592eef00a13bfc1e9bf31e45b2005588ccf (commit)
       via  923b030ed989472bc421379eecc5f8c979dc6ccb (commit)
       via  8b238f4945e839fa4d7a3d87e612cfab2d4021cf (commit)
       via  60087f7128d0e0434019cb36e7a480b77dbdbca4 (commit)
      from  69014ce97f9dd0cc5caf17ab23e49c6a7baecc53 (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=c77331b48476b0421b9ff76d1681b908208c6b06
commit c77331b48476b0421b9ff76d1681b908208c6b06
Merge: 69014ce c050c59
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jul 15 15:46:27 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 15 15:46:27 2011 -0400

    Merge topic 'fix-tests-failing-with-Xcode4' into next
    
    c050c59 Fix BuildDepends test to work with Xcode 4
    923b030 Fix Architecture test to work with Xcode 4
    8b238f4 KWSys Nightly Date Stamp
    60087f7 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c050c592eef00a13bfc1e9bf31e45b2005588ccf
commit c050c592eef00a13bfc1e9bf31e45b2005588ccf
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jul 15 15:34:17 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jul 15 15:34:17 2011 -0400

    Fix BuildDepends test to work with Xcode 4
    
    ppc tools are no longer available in the Xcode 4 installation.
    Eliminate the use of the hard-coded 'ppc' in the test when
    running on Snow Leopard or later.

diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt
index 70a2f37..f03c238 100644
--- a/Tests/BuildDepends/Project/CMakeLists.txt
+++ b/Tests/BuildDepends/Project/CMakeLists.txt
@@ -4,6 +4,11 @@ if(APPLE)
   # only use multi-arch if the sysroot exists on this machine
   if(EXISTS "${CMAKE_OSX_SYSROOT}")
     set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
+    if(NOT "${DARWIN_MAJOR_VERSION}.${DARWIN_MINOR_VERSION}" VERSION_LESS 10.0)
+      # Snow Leopard or later, use modern architectures as defaults
+      # Arch 'ppc' no longer works: tools no longer available starting with Xcode 4
+      set(CMAKE_OSX_ARCHITECTURES i386 x86_64)
+    endif()
   endif(EXISTS "${CMAKE_OSX_SYSROOT}")
 endif(APPLE)
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=923b030ed989472bc421379eecc5f8c979dc6ccb
commit 923b030ed989472bc421379eecc5f8c979dc6ccb
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Jul 15 14:51:22 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Jul 15 15:02:59 2011 -0400

    Fix Architecture test to work with Xcode 4
    
    ppc tools are no longer available in the Xcode 4 installation.
    Eliminate the use of the hard-coded 'ppc' in the test when
    running on Snow Leopard or later.

diff --git a/Tests/Architecture/CMakeLists.txt b/Tests/Architecture/CMakeLists.txt
index bc767fe..db84ea9 100644
--- a/Tests/Architecture/CMakeLists.txt
+++ b/Tests/Architecture/CMakeLists.txt
@@ -1,6 +1,14 @@
 cmake_minimum_required(VERSION 2.8)
 project(Architecture C)
 
+set(archs i386 ppc)
+
+if(NOT "${DARWIN_MAJOR_VERSION}.${DARWIN_MINOR_VERSION}" VERSION_LESS 10.0)
+  # Snow Leopard or later, use modern architectures as defaults
+  # Arch 'ppc' no longer works: tools no longer available starting with Xcode 4
+  set(archs i386 x86_64)
+endif()
+
 add_library(foo foo.c)
 if(CMAKE_OSX_ARCHITECTURES)
   get_property(archs TARGET foo PROPERTY OSX_ARCHITECTURES)
@@ -11,11 +19,26 @@ if(CMAKE_OSX_ARCHITECTURES)
       )
   endif()
 endif()
-set_property(TARGET foo PROPERTY OSX_ARCHITECTURES i386)
-set_property(TARGET foo PROPERTY OSX_ARCHITECTURES_DEBUG ppc)
+
+list(LENGTH archs archs_len)
+if(archs_len GREATER 1)
+  list(GET archs 0 arch0)
+  list(GET archs 1 arch1)
+else()
+  set(arch0 ${archs})
+  set(arch1 ${archs})
+endif()
+
+message("archs='${archs}'")
+message("arch0='${arch0}'")
+message("arch1='${arch1}'")
+
+set_property(TARGET foo PROPERTY OSX_ARCHITECTURES ${arch0})
+set_property(TARGET foo PROPERTY OSX_ARCHITECTURES_DEBUG ${arch1})
 
 add_executable(bar bar.c)
 target_link_libraries(bar foo)
+
 set_property(TARGET bar PROPERTY OUTPUT_NAME Architecture)
-set_property(TARGET bar PROPERTY OSX_ARCHITECTURES ppc)
-set_property(TARGET bar PROPERTY OSX_ARCHITECTURES_DEBUG i386)
+set_property(TARGET bar PROPERTY OSX_ARCHITECTURES ${arch1})
+set_property(TARGET bar PROPERTY OSX_ARCHITECTURES_DEBUG ${arch0})

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

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake         |    2 +-
 Tests/Architecture/CMakeLists.txt         |   31 +++++++++++++++++++++++++---
 Tests/BuildDepends/Project/CMakeLists.txt |    5 ++++
 3 files changed, 33 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake