--- CMakeLists.txt 2007-08-07 05:52:54.000000000 -0500 +++ CMakeLists.txt 2008-07-27 01:09:19.000000000 -0500 @@ -182,40 +182,6 @@ -# Set defaults for Universal Binaries. We want 32-bit Intel/PPC on 10.4 -# and 32/64-bit Intel/PPC on >= 10.5. Anything <= 10.3 doesn't support. -IF(APPLE) - # These are just defaults/recommendations, but how we want to build - # out of the box. But the user needs to be able to change these options. - # So we must only set the values the first time CMake is run, or we - # will overwrite any changes the user sets. - # FORCE is used because the options are not reflected in the UI otherwise. - # Seems like a good place to add version specific compiler flags too. - IF(NOT VPB_CONFIG_HAS_BEEN_RUN_BEFORE) - # This is really fragile, but CMake doesn't provide the OS system - # version information we need. (Darwin versions can be changed - # independently of OS X versions.) - # It does look like CMake handles the CMAKE_OSX_SYSROOT automatically. - IF(EXISTS /Developer/SDKs/10.5.sdk) - SET(CMAKE_OSX_ARCHITECTURES "ppc;i386;ppc64;x86_64" CACHE STRING "Build architectures for OSX" FORCE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) - ELSE(EXISTS /Developer/SDKs/10.5.sdk) - IF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) - SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.4 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) - ELSE(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) - # No Universal Binary support - # Should break down further to set the -mmacosx-version-min, - # but the SDK detection is too unreliable here. - ENDIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) - ENDIF(EXISTS /Developer/SDKs/10.5.sdk) - ENDIF(NOT VPB_CONFIG_HAS_BEEN_RUN_BEFORE) - - OPTION(VPB_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF) - -ENDIF(APPLE) - - # This needs to be run very last so other parts of the scripts can take # advantage of this. IF(NOT VPB_CONFIG_HAS_BEEN_RUN_BEFORE)