From 9726617b6e9b74b2084d2dfbb672a28d0e0b3141 Mon Sep 17 00:00:00 2001 From: Colin Cochran Date: Mon, 18 Mar 2019 08:55:05 -0600 Subject: [PATCH] Fixes osgViewer CMake build for Android. Adds FORCE to overwrite the cached OWG_WINDOWING_SYSTEM variable. --- src/osgViewer/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt index 95314f951..614e29879 100644 --- a/src/osgViewer/CMakeLists.txt +++ b/src/osgViewer/CMakeLists.txt @@ -82,14 +82,12 @@ IF(WIN32 AND NOT ANDROID) ) ELSE() IF(ANDROID) - SET(OSG_WINDOWING_SYSTEM "None" CACHE STRING "None Windowing system type for graphics window creation.") + 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") + SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation. options only X11" FORCE) ENDIF() - IF(ANDROID) - MESSAGE(STATUS "Windowing system not supported for Android.") - ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa") + IF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa") ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION) IF(OSG_COMPILE_FRAMEWORKS)