From 997276d359692765c32bcc8cb9da3c39ac11ad1d Mon Sep 17 00:00:00 2001 From: Colin Cochran Date: Sat, 16 Mar 2019 11:59:28 -0600 Subject: [PATCH] Fixes Android build for osgViewer. Previously, cmake attempted to build cocoa windowing system source even if MAKE_SYSTEM_NAME was set to ANDROID. --- src/osgViewer/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/osgViewer/CMakeLists.txt b/src/osgViewer/CMakeLists.txt index fc6164faf..95314f951 100644 --- a/src/osgViewer/CMakeLists.txt +++ b/src/osgViewer/CMakeLists.txt @@ -87,7 +87,9 @@ ELSE() SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation. options only X11") ENDIF() - IF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa") + IF(ANDROID) + MESSAGE(STATUS "Windowing system not supported for Android.") + ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa") ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION) IF(OSG_COMPILE_FRAMEWORKS)