From 4365b6cefb73a98879122c28dead473c99ef97b3 Mon Sep 17 00:00:00 2001 From: Damien Dupuis Date: Thu, 1 Oct 2009 09:42:04 +0000 Subject: [PATCH] Don't ask me why but the simple test : "^10\\.[012345]*" believes that 10.6.1 is < 10.6 I changed the test to : "^10\\.[012345]\\.?" and tested it with 10.5 10.5.8 10.6 10.6.1 everything is ok --- hurricane/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hurricane/CMakeLists.txt b/hurricane/CMakeLists.txt index 0c64f176..4f0b95fe 100644 --- a/hurricane/CMakeLists.txt +++ b/hurricane/CMakeLists.txt @@ -13,11 +13,12 @@ IF(APPLE) OUTPUT_VARIABLE OSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'") - IF(${OSX_VERSION} MATCHES "^10\\.[012345]*") + IF(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") MESSAGE(STATUS "OSX < 10.6") - ELSE(${OSX_VERSION} MATCHES "^10\\.[012345]*") + ELSE(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") + MESSAGE(STATUS "OSX >= 10.6") SET(CMAKE_OSX_ARCHITECTURES "i386;ppc") # for QT4.5 32bits on snow leopard - ENDIF(${OSX_VERSION} MATCHES "^10\\.[012345]*") + ENDIF(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?") ENDIF(APPLE) OPTION(BUILD_STATIC "Build static version of libraries & binaries" OFF)