FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes osgViewer CMake build for Android.

Browse Source 
Adds FORCE to overwrite the cached OWG_WINDOWING_SYSTEM variable.
This commit is contained in:
Colin Cochran 2019-03-18 08:55:05 -06:00
parent 997276d359
commit 9726617b6e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgViewer/CMakeLists.txt
View File

@ -82,14 +82,12 @@ IF(WIN32 AND NOT ANDROID)
) )
ELSE() ELSE()
IF(ANDROID) 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() 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() ENDIF()
IF(ANDROID) IF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa")
MESSAGE(STATUS "Windowing system not supported for Android.")
ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "Cocoa")
ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION) ADD_DEFINITIONS(-DUSE_DARWIN_COCOA_IMPLEMENTATION)
IF(OSG_COMPILE_FRAMEWORKS) IF(OSG_COMPILE_FRAMEWORKS)