[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.6.2.2 1.6.2.3

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Feb 19 16:02:37 EST 2009


Update of /cvsroot/CMake/CMake/Tests/BuildDepends/Project
In directory public:/mounts/ram/cvs-serv27675/Project

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in fix for test on older macs


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/BuildDepends/Project/CMakeLists.txt,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -C 2 -d -r1.6.2.2 -r1.6.2.3
*** CMakeLists.txt	19 Feb 2009 16:53:46 -0000	1.6.2.2
--- CMakeLists.txt	19 Feb 2009 21:02:35 -0000	1.6.2.3
***************
*** 1,5 ****
  cmake_minimum_required(VERSION 2.6)
  project(testRebuild)
! set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
  add_library(foo STATIC ${testRebuild_BINARY_DIR}/foo.cxx)
  set_target_properties(foo PROPERTIES OUTPUT_NAME "foolib")
--- 1,11 ----
  cmake_minimum_required(VERSION 2.6)
  project(testRebuild)
! if(APPLE)
!   # only use multi-arch if the sysroot exists on this machine
!   if(EXISTS "${CMAKE_OSX_SYSROOT}")
!     set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
!   endif(EXISTS "${CMAKE_OSX_SYSROOT}")
! endif(APPLE)
! 
  add_library(foo STATIC ${testRebuild_BINARY_DIR}/foo.cxx)
  set_target_properties(foo PROPERTIES OUTPUT_NAME "foolib")



More information about the Cmake-commits mailing list