Merged Alberto Luaces commit "Avoid that mingw cross-compilation choosing X11 as the windowing system" from the OpenSceneGraph-3.6 branch

robertosfield · robertosfield · commit 8607ac24eb1a · 2019-07-16T11:49:32.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,6 +42,8 @@ IF(APPLE)
     MESSAGE(STATUS "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
@@ -52,7 +54,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
@@ -120,7 +122,6 @@ ELSE()
     SET(OSG_WINDOWING_SYSTEM "X11" CACHE STRING "Windowing system type for graphics window creation; options: X11 or None.")
 ENDIF()
 
-PROJECT(OpenSceneGraph)
 
 SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
 
