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
74 lines
2.4 KiB
CMake
74 lines
2.4 KiB
CMake
# Locate QuickTime
|
|
# This module defines
|
|
# QUICKTIME_LIBRARY
|
|
# QUICKTIME_FOUND, if false, do not try to link to gdal
|
|
# QUICKTIME_INCLUDE_DIR, where to find the headers
|
|
#
|
|
# $QUICKTIME_DIR is an environment variable that would
|
|
# correspond to the ./configure --prefix=$QUICKTIME_DIR
|
|
#
|
|
# Created by Eric Wing.
|
|
|
|
|
|
# QuickTime on OS X looks different than QuickTime for Windows,
|
|
# so I am going to case the two.
|
|
|
|
IF(APPLE)
|
|
FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h)
|
|
FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
|
|
ELSE()
|
|
FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
|
|
$ENV{QUICKTIME_DIR}/include
|
|
$ENV{QUICKTIME_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h
|
|
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
|
|
NO_DEFAULT_PATH
|
|
PATH_SUFFIXES include
|
|
)
|
|
FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h)
|
|
|
|
FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
|
|
$ENV{QUICKTIME_DIR}/lib
|
|
$ENV{QUICKTIME_DIR}
|
|
NO_DEFAULT_PATH
|
|
)
|
|
FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime
|
|
PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
|
|
NO_DEFAULT_PATH
|
|
PATH_SUFFIXES lib64 lib
|
|
)
|
|
FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime)
|
|
ENDIF()
|
|
|
|
|
|
SET(QUICKTIME_FOUND "NO")
|
|
IF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR)
|
|
SET(QUICKTIME_FOUND "YES")
|
|
ENDIF()
|
|
|
|
IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
|
|
SET(QUICKTIME_FOUND "NO")
|
|
ELSE()
|
|
IF(APPLE)
|
|
#Quicktime is not supported under 64bit OSX build so we need to detect it and disable it.
|
|
#First check to see if we are running with a native 64-bit compiler (10.6 default) and implicit arch
|
|
IF(NOT CMAKE_OSX_ARCHITECTURES AND CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
SET(QUICKTIME_FOUND "NO")
|
|
ELSE()
|
|
#Otherwise check to see if 64-bit is explicitly called for.
|
|
LIST(FIND CMAKE_OSX_ARCHITECTURES "x86_64" has64Compile)
|
|
IF(NOT has64Compile EQUAL -1)
|
|
SET(QUICKTIME_FOUND "NO")
|
|
ENDIF()
|
|
ENDIF()
|
|
# Disable quicktime for >= 10.7, as it's officially deprecated
|
|
|
|
IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.8" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.9" OR ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.10")
|
|
MESSAGE("disabling quicktime because it's not supported by the selected SDK ${OSG_OSX_SDK_NAME}")
|
|
SET(QUICKTIME_FOUND "NO")
|
|
ENDIF()
|
|
ENDIF()
|
|
ENDIF()
|