diff -r 69afa05061c2 -r be70fd3458c0 CMakeLists.txt --- a/CMakeLists.txt Wed Nov 18 14:50:14 2009 +0000 +++ b/CMakeLists.txt Fri Nov 20 14:56:43 2009 +0000 @@ -12,8 +12,6 @@ set(CPACK_PACKAGE_VERSION_MINOR "9") set(CPACK_PACKAGE_VERSION_PATCH "13-dev") -set(build_type "standard") - if(APPLE) set(CMAKE_FIND_FRAMEWORK "FIRST") @@ -26,16 +24,14 @@ #build architecture / os version set(minimum_os $ENV{MACOSX_DEPLOYMENT_TARGET}) if(minimum_os MATCHES "10.4") - message(STATUS "Target: Mac OS X 10.4 i386") + message(STATUS "Target: Mac OS X 10.4 i386/ppc") set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/") - set(CMAKE_OSX_ARCHITECTURES "i386") - set(build_type "standard") + set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") endif() if(minimum_os MATCHES "10.5") message(STATUS "Target: Mac OS X 10.5 i386/ppc") set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/") set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400") - set(build_type "universal") endif() if(minimum_os MATCHES "10.6") message(STATUS "Target: Mac OS X 10.6 i386/ppc/x86_64")