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
This commit is contained in:
parent
093a51ddb3
commit
4365b6cefb
|
@ -13,11 +13,12 @@ IF(APPLE)
|
||||||
OUTPUT_VARIABLE OSX_VERSION
|
OUTPUT_VARIABLE OSX_VERSION
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
|
MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
|
||||||
IF(${OSX_VERSION} MATCHES "^10\\.[012345]*")
|
IF(${OSX_VERSION} MATCHES "^10\\.[012345]\\.?")
|
||||||
MESSAGE(STATUS "OSX < 10.6")
|
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
|
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)
|
ENDIF(APPLE)
|
||||||
|
|
||||||
OPTION(BUILD_STATIC "Build static version of libraries & binaries" OFF)
|
OPTION(BUILD_STATIC "Build static version of libraries & binaries" OFF)
|
||||||
|
|
Loading…
Reference in New Issue