Changeset 8479

Show
Ignore:
Timestamp:
06/20/08 18:57:22
Author:
robert
Message:

Added OSG_WINDOWING_SYSTEM cmake option string to allow toggling between X11 and Carbon under OSX.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/src/osgViewer/CMakeLists.txt

    r8211 r8479  
    5151 
    5252    IF(APPLE) 
     53        SET(OSG_WINDOWING_SYSTEM "Carbon" CACHE STRING "Windowing system type for graphics window creation, options Carbon or X11.") 
     54    ELSE(APPLE) 
     55        SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation. options only X11") 
     56    ENDIF(APPLE) 
     57     
     58 
     59    IF(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon") 
    5360 
    5461        # FIXME: OS X needs selection mechanism for Cocoa, Carbon, X11 
    …… 
    6269        ) 
    6370 
    64     ELSE(APPLE) 
     71    ELSE(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon") 
     72 
    6573        # X11 for everybody else 
    6674        OPTION(OSGVIEWER_USE_XRANDR "Set to ON to enable Xrandr support for GraphicsWindowX11." OFF) 
    …… 
    8492        ENDIF(OSGVIEWER_USE_XRANDR) 
    8593 
    86     ENDIF(APPLE) 
     94    ENDIF(${OSG_WINDOWING_SYSTEM} STREQUAL "Carbon") 
    8795 
    8896ENDIF(WIN32)