[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.8 1.9

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Feb 19 15:24:46 EST 2009


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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: make sure multiple archs are only tested when the work


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/BuildDepends/Project/CMakeLists.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** CMakeLists.txt	19 Feb 2009 16:51:24 -0000	1.8
--- CMakeLists.txt	19 Feb 2009 20:24:44 -0000	1.9
***************
*** 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