From b5dff9410740e78c1605e60c79dd231cb68cf904 Mon Sep 17 00:00:00 2001 From: valid-ptr Date: Sun, 14 Apr 2019 00:04:11 +0300 Subject: [PATCH] CMake: OSG_WINDOWING_SYSTEM fixed; FORCE flag removed --- CMakeLists.txt | 7 ++++++- src/osgViewer/CMakeLists.txt | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e2c7cd90..11528cdd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,11 @@ ENDIF() # See https://cmake.org/Bug/view.php?id=14695#c34953 # Additionally, OSG_WINDOWING_SYSTEM is set here for OSX since its # value is needed to find the correct version of OpenGL (X11 or Cocoa). -IF(APPLE AND NOT ANDROID) +IF(ANDROID) + SET(OSG_WINDOWING_SYSTEM "None" CACHE STRING "None Windowing system type for graphics window creation.") + +ELSIF(APPLE) # custom option to flag an iOS build OPTION(OSG_BUILD_PLATFORM_IPHONE "Enable IPhoneSDK Device support" OFF) @@ -107,6 +110,8 @@ IF(APPLE AND NOT ANDROID) MESSAGE(WARNING "OSX 10.3 and earlier not supported.") ENDIF() ENDIF() +ELSE() + SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation. options only X11") ENDIF() diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt index 614e29879..27493b0d2 100644 --- a/src/osgViewer/CMakeLists.txt +++ b/src/osgViewer/CMakeLists.txt @@ -81,12 +81,6 @@ IF(WIN32 AND NOT ANDROID) PixelBufferWin32.cpp ) ELSE() - IF(ANDROID) - SET(OSG_WINDOWING_SYSTEM "None" CACHE STRING "None Windowing system type for graphics window creation." FORCE) - ELSE() - SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation. options only X11" FORCE) - ENDIF() - IF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa") ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION)