From f76755d803a00a58e81d3bbe90f855119b8ec678 Mon Sep 17 00:00:00 2001 From: Sophie Belloeil Date: Wed, 21 Jul 2010 13:03:36 +0000 Subject: [PATCH] No more setup_apple macro --- bootstrap/cmake_modules/FindBootstrap.cmake | 29 +++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake index 52369e8b..a468b0ed 100644 --- a/bootstrap/cmake_modules/FindBootstrap.cmake +++ b/bootstrap/cmake_modules/FindBootstrap.cmake @@ -17,20 +17,21 @@ # # Specific Apple OSX setup # - macro(setup_apple) - if(APPLE) - execute_process( - COMMAND sw_vers -productVersion - OUTPUT_VARIABLE OSX_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - message(STATUS "OSX_VERSION='${OSX_VERSION}'") - if(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") - message(STATUS "OSX < 10.6") - else(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") - set(CMAKE_OSX_ARCHITECTURES "i386;ppc") # for QT4.5 32bits on snow leopard - endif(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") - endif(APPLE) - endmacro(setup_apple) +# This is no more needed since QT 4.6 is available for Mac OSX 10.6 +# macro(setup_apple) +# if(APPLE) +# execute_process( +# COMMAND sw_vers -productVersion +# OUTPUT_VARIABLE OSX_VERSION +# OUTPUT_STRIP_TRAILING_WHITESPACE) +# message(STATUS "OSX_VERSION='${OSX_VERSION}'") +# if(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") +# message(STATUS "OSX < 10.6") +# else(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") +# set(CMAKE_OSX_ARCHITECTURES "i386;ppc") # for QT4.5 32bits on snow leopard +# endif(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") +# endif(APPLE) +# endmacro(setup_apple)