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

Avoid that mingw cross-compilation choosing X11 as the windowing system.

Browse Source 
I have moved the PROJECT stanza before the conditionals, because
otherwise expressions like IF(MINGW) always fail.
This commit is contained in:
Alberto Luaces 2019-07-16 11:08:25 +02:00
parent 8a4cdcf264
commit 117fd42efc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -41,6 +41,8 @@ IF(APPLE)
OSG_OSX_VERSION "${OSG_OSX_VERSION}")
ENDIF()
PROJECT(OpenSceneGraph)
# Set OSX architecture flags here, since they must be specified before
# creating the actual OSG project.
# Note that the CMAKE_OSX_* variables are not well documented in
@ -51,7 +53,7 @@ ENDIF()
IF(ANDROID)
SET(OSG_WINDOWING_SYSTEM "None" CACHE STRING "Windowing system type for graphics window creation; options: None.")
ELSEIF(WIN32)
ELSEIF(WIN32 OR MINGW)
SET(OSG_WINDOWING_SYSTEM "Win32" CACHE STRING "Windowing system type for graphics window creation; options: Win32 or None.")
ELSEIF(APPLE)
# custom option to flag an iOS build
@ -116,8 +118,6 @@ ELSE()
ENDIF()
PROJECT(OpenSceneGraph)
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
SET(OSG_PLUGINS osgPlugins-${OPENSCENEGRAPH_VERSION})