[Cmake-commits] CMake branch, next, updated. v2.8.4-1897-gcaeb79d

[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  caeb79d42dabfcb6f0a519b7185b0da50e2e645c (commit)
       via  1a53fb7537c6f37f8ccfa418919b332a4928679a (commit)
      from  ac807d57efd21685bbd75a9211290dda4ff44f65 (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=caeb79d42dabfcb6f0a519b7185b0da50e2e645c
commit caeb79d42dabfcb6f0a519b7185b0da50e2e645c
Merge: ac807d5 1a53fb7
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jul 19 12:15:23 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 19 12:15:23 2011 -0400

    Merge topic 'fix-tests-failing-with-Xcode4' into next
    
    1a53fb7 Use correct default multiple architecture values in test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a53fb7537c6f37f8ccfa418919b332a4928679a
commit 1a53fb7537c6f37f8ccfa418919b332a4928679a
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Jul 19 11:53:31 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Jul 19 11:53:31 2011 -0400

    Use correct default multiple architecture values in test
    
    Even if CMAKE_OSX_ARCHITECTURES value is a single value...

diff --git a/Tests/Architecture/CMakeLists.txt b/Tests/Architecture/CMakeLists.txt
index c210727..927ce3f 100644
--- a/Tests/Architecture/CMakeLists.txt
+++ b/Tests/Architecture/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 2.8)
 project(Architecture C)
 
-set(archs i386 ppc)
-
 function(test_for_xcode4 result_var)
   set(${result_var} 0 PARENT_SCOPE)
   if(APPLE)
@@ -19,10 +17,14 @@ endfunction()
 
 test_for_xcode4(is_xcode4)
 
+set(arch0 i386)
+set(arch1 ppc)
+
 if(is_xcode4)
   # Xcode 4, use modern architectures as defaults
   # Arch 'ppc' no longer works: tools no longer available starting with Xcode 4
-  set(archs i386 x86_64)
+  set(arch0 i386)
+  set(arch1 x86_64)
 endif()
 
 add_library(foo foo.c)
@@ -34,12 +36,11 @@ if(CMAKE_OSX_ARCHITECTURES)
       "Expected [${CMAKE_OSX_ARCHITECTURES}], got [${archs}]."
       )
   endif()
-endif()
-
-list(LENGTH archs archs_len)
-if(archs_len GREATER 1)
-  list(GET archs 0 arch0)
-  list(GET archs 1 arch1)
+  list(LENGTH archs archs_len)
+  if(archs_len GREATER 1)
+    list(GET archs 0 arch0)
+    list(GET archs 1 arch1)
+  endif()
 endif()
 
 message("is_xcode4='${is_xcode4}'")

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

Summary of changes:
 Tests/Architecture/CMakeLists.txt |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake