53e337611a
The mac os sdk version is recognized by the current CMAKE script as 10.1 instead of 10.10 since it cuts the version string from the 4th place. I introduced a more reliable version checking based on splitting the returned version code into MAJOR MINOR and PATCH parts and reassemble the OSG sdk version afterwards.
I replaced the existing CMake code against the following (returning now version 10.10 as expected):
# Determine the canonical name of the selected Platform SDK
EXECUTE_PROCESS(COMMAND "/usr/bin/sw_vers" "-productVersion"
OUTPUT_VARIABLE OSG_OSX_SDK_NAME
OUTPUT_STRIP_TRAILING_WHITESPACE)
STRING(REPLACE "." ";" MACOS_VERSION_LIST ${OSG_OSX_SDK_NAME})
LIST(GET MACOS_VERSION_LIST 0 MACOS_VERSION_MAJOR)
LIST(GET MACOS_VERSION_LIST 1 MACOS_VERSION_MINOR)
LIST(GET MACOS_VERSION_LIST 2 MACOS_VERSION_PATCH)
SET(OSG_OSX_SDK_NAME "macosx${MACOS_VERSION_MAJOR}.${MACOS_VERSION_MINOR}")
Also i added the check for the new Version to some more find scripts.
Additionally the nil object in Objective C now seems to be equivalent with a null_ptr that cannot be passed as GLInt anymore. So i switched this in the PixelBufferCocoa.mm to pass a zero instead of nil.
"
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14527 16af8721-9629-0410-8352-f15c8da7e697
41 lines
1.2 KiB
CMake
41 lines
1.2 KiB
CMake
# Locate Apple AVFoundation (next-generation QTKit)
|
|
# This module defines
|
|
# AV_FOUNDATION_LIBRARY
|
|
# AV_FOUNDATION_FOUND, if false, do not try to link to gdal
|
|
#
|
|
# $AV_FOUNDATION_DIR is an environment variable that would
|
|
# correspond to the ./configure --prefix=$AV_FOUNDATION_DIR
|
|
#
|
|
# Created by Stephan Maximilian Huber
|
|
|
|
|
|
IF(APPLE)
|
|
FIND_LIBRARY(AV_FOUNDATION_LIBRARY AVFoundation)
|
|
ENDIF()
|
|
|
|
SET(AV_FOUNDATION_FOUND "NO")
|
|
IF(AV_FOUNDATION_LIBRARY)
|
|
SET(AV_FOUNDATION_FOUND "YES")
|
|
ENDIF()
|
|
|
|
IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
|
|
# AVFoundation exists ON iOS, too -- good support for SDK 6.0 and greater
|
|
IF(${IPHONE_SDKVER} LESS "6.0")
|
|
SET(AV_FOUNDATION_FOUND "NO")
|
|
ELSE()
|
|
SET(AV_FOUNDATION_FOUND "YES")
|
|
ENDIF()
|
|
ELSE()
|
|
IF(APPLE)
|
|
# AVFoundation exists since 10.7, but only 10.8 has all features necessary for OSG
|
|
# so check the SDK-setting
|
|
|
|
IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.10")
|
|
# nothing special here ;-)
|
|
ELSE()
|
|
MESSAGE("AVFoundation disabled for SDK < 10.8")
|
|
SET(AV_FOUNDATION_FOUND "NO")
|
|
ENDIF()
|
|
ENDIF()
|
|
ENDIF()
|