Thanks Jan, changes merged and submitted to svn/trunk.
On 20 November 2014 at 09:17, Jan Klimke <[email protected]> wrote:
> Hi,
>
> i noticed, that there are a couple of additional flaws when building osg
> for Mac OS X 10.10 Yosemite.
>
> 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.
>
> Pleaser find the submission attached.
>
> Kind regards,
> Jan
>
> ------------------
> Read this topic online here:
> http://forum.openscenegraph.org/viewtopic.php?p=61716#61716
>
>
>
>
> Attachments:
> http://forum.openscenegraph.org//files/osg_macos1010_512.zip
>
>
> _______________________________________________
> osg-submissions mailing list
> [email protected]
>
> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
>
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
