From d511288718a895504d5c8923fd13b112c23ab492 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 20 Sep 2012 11:16:02 +0000 Subject: [PATCH] From Ulrich Hertlein, "attached is a patch to src/osgViewer/CMakeLists.txt that inverts the logic of when to use Cocoa and when to use the old Carbon interface for the windowing system. The old code had to be modified for every new OS X release to default to Cocoa. The new code uses Carbon for <= OS X 10.4 and Cocoa on everything else." --- src/osgViewer/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt index c4e62b465..120273889 100644 --- a/src/osgViewer/CMakeLists.txt +++ b/src/osgViewer/CMakeLists.txt @@ -68,12 +68,13 @@ ELSE() IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR) SET(OSG_WINDOWING_SYSTEM "IOS" CACHE STRING "Windowing system type for graphics window creation, options only IOS.") ELSE() - IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.7" OR - ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.6" OR - ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.5") - SET(OSG_WINDOWING_SYSTEM "Cocoa" CACHE STRING "Windowing system type for graphics window creation, options Carbon, Cocoa or X11.") - ELSE() + IF(${OSG_OSX_SDK_NAME} STREQUAL "macosx10.4" OR + ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.3" OR + ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.2" OR + ${OSG_OSX_SDK_NAME} STREQUAL "macosx10.1") SET(OSG_WINDOWING_SYSTEM "Carbon" CACHE STRING "Windowing system type for graphics window creation, options Carbon, Cocoa or X11.") + ELSE() + SET(OSG_WINDOWING_SYSTEM "Cocoa" CACHE STRING "Windowing system type for graphics window creation, options Carbon, Cocoa or X11.") ENDIF() ENDIF()