FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
cceee38727
OpenSceneGraph/CMakeModules
History
Robert Osfield 53e337611a From Jan Klimke, "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.
"


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14527 16af8721-9629-0410-8352-f15c8da7e697
2014-11-24 15:19:20 +00:00
..
CheckAtomicOps.cmake From Björn Blissing, fix for ambiguous defines in Atomic.cpp when compiling with MinGW and GCC 2014-11-21 10:21:46 +00:00
clean_directories Added utilty script for cleaning up build files/directories. 2008-03-14 15:33:47 +00:00
cmake_uninstall.cmake.in From Rafa Gaitan, "Attached the fix to remove the symlinks created with make install." 2011-03-10 10:56:12 +00:00
Find3rdPartyDependencies.cmake From Torben Dannhauer, "Please find attached further changes to make library auto detection 2013-07-23 05:25:39 +00:00
FindAndroidNDK.cmake From Jorge Ciges, "Update to FindAndroidNDK to make it use the latest Ndk (r5c) automatically. 2011-06-14 18:10:27 +00:00
FindAsio.cmake Removed execute properties via svn propdel svn:executable file 2014-01-07 16:43:07 +00:00
FindAVFoundation.cmake From Jan Klimke, "i noticed, that there are a couple of additional flaws when building osg for Mac OS X 10.10 Yosemite. 2014-11-24 15:19:20 +00:00
FindCOLLADA.cmake From Torben Dannahuer, "modified findcollada.cmake which can now detect Boost 1.55 libraries, which are used by Collada in my 3rdParty package" 2014-01-24 16:28:34 +00:00
FindCoreMedia.cmake From Stephan Huber, OSX and iOS Video support via a QTKit plugin from OSX 10.7 and before, and an AVFoundation plugin for iOS and OSX10.8 and later. 2012-10-02 14:07:12 +00:00
FindCoreVideo.cmake From Eric Wing, QTKit plugin for reading movies under OSX using QTKit + CoreVideo 2010-09-24 12:59:37 +00:00
FindDirectInput.cmake From Wang Rui, "I implemented a customized viewer event traversal here to read state 2010-12-13 11:34:33 +00:00
FindDirectShow.cmake From Cedric Pinson, "Here an update of the directshow plugin. It fixes issues with 2009-11-20 10:48:51 +00:00
FindFBX.cmake From Paul Cheyrou-Lagreze, "Attached is fix/feature for FBX osgplugins against latest trunk: 2014-04-09 17:40:27 +00:00
FindFFmpeg.cmake From David Longest, "I have updated the FFmpeg plugin to support the 1.0 release version of FFmpeg. The files attached were modified in order to facilitate the update. Below are the details for all changes made. 2013-02-06 12:46:03 +00:00
FindFLTK.cmake From Mattias Helsing, "I finally got to fix the cmake Modules that have duplicates in later 2014-04-29 12:19:21 +00:00
FindFOX.cmake From Philip Lowman, removed inappropriate references to OSG_ in 3rd party libs searches 2009-05-18 10:17:57 +00:00
FindFreetype.cmake From Mattias Helsing, "I finally got to fix the cmake Modules that have duplicates in later 2014-04-29 12:19:21 +00:00
FindGDAL.cmake From Mattias Helsing, "I finally got to fix the cmake Modules that have duplicates in later 2014-04-29 12:19:21 +00:00
FindGIFLIB.cmake From Philip Lowman, removed inappropriate references to OSG_ in 3rd party libs searches 2009-05-18 10:17:57 +00:00
FindGLCORE.cmake From Paul Martz, "There is no standard place for gl/glcorearb.h on Windows. Previously, the only way to get OSG to build for core profile was to append an additional include directory ("/I") onto the CFLAGS variables This submission adds a FindGLCORE.cmake script so that the path to gl/glcorearb.h can be specified with a variable, GLCORE_ROOT, either in CMake or the environment. 2014-04-29 12:18:51 +00:00
FindGTA.cmake From Martin Lambers, "It adds a new ReaderWriter plugin for the GTA file format 2012-02-17 16:45:49 +00:00
FindGtkGl.cmake Moved finding of RSVG, Poppler-glib and GtkGl out into their own Find*.cmake modules to enable easier specialization. 2010-11-11 16:51:46 +00:00
FindInventor.cmake From Jan Peciva, improvements to Inventor find operation 2010-01-31 18:23:35 +00:00
FindJasper.cmake From Mattias Helsing, "I finally got to fix the cmake Modules that have duplicates in later 2014-04-29 12:19:21 +00:00
FindLibVNCServer.cmake From Philip Lowman, removed inappropriate references to OSG_ in 3rd party libs searches 2009-05-18 10:17:57 +00:00
FindLua52.cmake Laurens Voerman, "my cmake (2.8.10.2 generating for Visual Studio 11 Win64) doesn't like 2013-10-10 14:41:41 +00:00
FindNVTT.cmake From Torben Dannhauer, "Please find attached further changes to make library auto detection 2013-07-23 05:25:39 +00:00
FindOpenEXR.cmake From Simon Julier, "I ran across linking errors with osgdb_exr. Specifically, I found it was necessary to link against libImlIlf, libImlThread, libHalf, libIex and libzip. 2011-01-19 10:57:58 +00:00
FindOpenThreads.cmake From Mattias Helsing, "I finally got to fix the cmake Modules that have duplicates in later 2014-04-29 12:19:21 +00:00
FindOpenVRML.cmake From Jan Ciger, "I am attaching the updated VRML plugin, as promised. This version works 2009-05-26 14:22:56 +00:00
FindOSG.cmake Renamed the OSGSIM cmake variable to OSGSIM_LIBRARY to be consistent with the rest of the variables. 2014-01-06 10:23:26 +00:00
FindOurDCMTK.cmake From Jean-Christophe Lombardo, "On Fedora 14, dcmtk libs are under /usr/lib/dcmtk. I've added a PATH_SUFFIX to take that into account" 2011-06-16 08:46:30 +00:00
FindPerformer.cmake From Philip Lowman, removed inappropriate references to OSG_ in 3rd party libs searches 2009-05-18 10:17:57 +00:00
FindPoppler-glib.cmake Moved finding of RSVG, Poppler-glib and GtkGl out into their own Find*.cmake modules to enable easier specialization. 2010-11-11 16:51:46 +00:00
FindQTKit.cmake From Stephan Huber, "attached you'll find some tweaks for the FindQuicktime and 2011-06-14 09:01:54 +00:00
FindQuartzCore.cmake From Stephan Huber, OSX and iOS Video support via a QTKit plugin from OSX 10.7 and before, and an AVFoundation plugin for iOS and OSX10.8 and later. 2012-10-02 14:07:12 +00:00
FindQuickTime.cmake From Jan Klimke, "i noticed, that there are a couple of additional flaws when building osg for Mac OS X 10.10 Yosemite. 2014-11-24 15:19:20 +00:00
FindRSVG.cmake From Kristofer Tingdahl, Build fix for svg plugin that makes sure the version of librsvg is at sufficient, and fixed a missing virtual destructor warning. 2013-11-22 09:48:02 +00:00
FindV8.cmake Added osgpresentation example as a test bed for new osgPresentation object model. 2013-08-07 17:08:38 +00:00
FindXine.cmake From Philip Lowman, removed inappropriate references to OSG_ in 3rd party libs searches 2009-05-18 10:17:57 +00:00
FindZeroConf.cmake Removed execute properties via svn propdel svn:executable file 2014-01-07 16:43:07 +00:00
FindZLIB.cmake From Mattias Helsing, "I finally got to fix the cmake Modules that have duplicates in later 2014-04-29 12:19:21 +00:00
ListHandle.cmake Fixed tabbing 2007-04-27 09:49:28 +00:00
ModuleInstall.cmake From Rafa Gaitan, "I finally had some time to change the build system for Android using a Toolchain, which, I think, will be easier to maintain and uses cmake standard system to build it. 2014-11-21 10:37:33 +00:00
OsgAndroidMacroUtils.cmake From Jorge Izquierdo Ciges, "Mostly small changes to add more compile options, and shared linking (still testing that capability, but this enables on a compile basis if the user wants). Robert, when you give the Ok I'll update/rewrite the Android section in the old/new wiki you'll say where is better. Mostly to be clear for the future users what options can configure and what are their purpose." 2012-04-19 09:50:10 +00:00
OsgCPack.cmake From Jean-Sebastien Guay, "I like the recent addition that adds folders in the solution tree to better organize the numerous examples, libraries, plugins etc. 2011-05-27 09:08:48 +00:00
OsgCPackConfig.cmake.in From Alan Dickinson, "I modified the CPack and CMake files to utilze the CMAKE_INSTALL_PREFIX when building RPM packages. 2011-03-11 10:18:43 +00:00
OsgDetermineCompiler.cmake From Philip Lowman, clean up of CMake files 2009-04-09 09:23:45 +00:00
OsgMacroUtils.cmake From Rafa Gaitan, "I finally had some time to change the build system for Android using a Toolchain, which, I think, will be easier to maintain and uses cmake standard system to build it. 2014-11-21 10:37:33 +00:00
UtilityMacros.cmake From Philip Lowman, clean up of CMake files 2009-04-09 09:23:45 +00:00