diff options
| author | Frederic Morin | 2013-03-02 17:14:07 -0500 |
|---|---|---|
| committer | Adam Vandenberg | 2013-03-08 11:51:49 -0800 |
| commit | b595738bd476cb87fa2a0e1dc318314ae3bfa72e (patch) | |
| tree | 6f6d9b4510196f77bbfa4939102fbd00b0197bff /Library/Formula | |
| parent | 526c4e96dbabe332a6120415f5b5747bf5692a7a (diff) | |
| download | homebrew-b595738bd476cb87fa2a0e1dc318314ae3bfa72e.tar.bz2 | |
open-scene-graph: use /usr/bin/sw_vers to determine osx version
current behaviour uses SDKSettings.plist to determine osx version but this
file is only available when XCode is installed.
Closes #18210.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/open-scene-graph.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Library/Formula/open-scene-graph.rb b/Library/Formula/open-scene-graph.rb index e60597b71..9f6c000f2 100644 --- a/Library/Formula/open-scene-graph.rb +++ b/Library/Formula/open-scene-graph.rb @@ -28,6 +28,8 @@ class OpenSceneGraph < Formula # The mini-Boost finder in FindCOLLADA doesn't find our boost, so fix it. # Also CMakeLists is missing an OR plus code for 10.8. # Reported: http://forum.openscenegraph.org/viewtopic.php?t=10647 + # Use /usr/bin/sw_vers to determine OS version; reported upstream: + # http://forum.openscenegraph.org/viewtopic.php?t=11878 # Remove: Unknown. Neither fix is merged upstream yet. def patches DATA @@ -91,6 +93,19 @@ index 428cb29..6206580 100644 ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw --- a/CMakeLists.txt 2012-03-23 03:21:51.000000000 -0700 +++ b/CMakeLists.txt 2012-08-29 11:55:21.000000000 -0700 +@@ -189,9 +189,11 @@ ENDIF(OSG_MAINTAINER) + IF(NOT ANDROID) + IF(APPLE) + # Determine the canonical name of the selected Platform SDK +- EXECUTE_PROCESS(COMMAND "defaults" "read" "${CMAKE_OSX_SYSROOT}/SDKSettings.plist" "CanonicalName" ++ EXECUTE_PROCESS(COMMAND "/usr/bin/sw_vers" "-productVersion" + OUTPUT_VARIABLE OSG_OSX_SDK_NAME + OUTPUT_STRIP_TRAILING_WHITESPACE) ++ STRING(SUBSTRING "${OSG_OSX_SDK_NAME}" 0 4 OSG_OSX_SDK_NAME) ++ SET(OSG_OSX_SDK_NAME "macosx${OSG_OSX_SDK_NAME}") + + # Trying to get CMake to generate an XCode IPhone project, current efforts are to get iphoneos sdk 3.1 working + # Added option which needs manually setting to select the IPhone SDK for building. We can only have one of the below @@ -824,16 +824,15 @@ # FORCE is used because the options are not reflected in the UI otherwise. # Seems like a good place to add version specific compiler flags too. |