File tree Expand file tree Collapse file tree
PlatformSpecifics/Android Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
1313set (CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE )
1414set_property (GLOBAL PROPERTY USE_FOLDERS ON )
1515
16- CMAKE_MINIMUM_REQUIRED (VERSION 3.0 FATAL_ERROR )
16+ CMAKE_MINIMUM_REQUIRED (VERSION 3.2 FATAL_ERROR )
1717
1818if (COMMAND cmake_policy)
1919 # INTERPROCEDURAL_OPTIMIZATION is enforced when enabled.
Original file line number Diff line number Diff line change 210210
211211# Modified by Lasse Oorni and Yao Wei Tjong for Urho3D
212212
213- cmake_minimum_required ( VERSION 3.0 )
213+ cmake_minimum_required ( VERSION 3.2 )
214214
215215# Urho3D: on Windows Cygwin-based NDK tools may fail in the linking phase with too long command line. Turn on response files to avoid this
216216if ( CMAKE_HOST_WIN32 )
@@ -234,11 +234,7 @@ if( _CMAKE_IN_TRY_COMPILE )
234234endif ()
235235
236236# this one is important
237- if ( CMAKE_VERSION VERSION_GREATER "3.0.99" )
238- set ( CMAKE_SYSTEM_NAME Android )
239- else ()
240- set ( CMAKE_SYSTEM_NAME Linux )
241- endif ()
237+ set ( CMAKE_SYSTEM_NAME Android )
242238
243239# this one not so much
244240set ( CMAKE_SYSTEM_VERSION 1 )
Original file line number Diff line number Diff line change 1- cmake_minimum_required (VERSION 3.0 )
1+ cmake_minimum_required (VERSION 3.2 )
22
33SET (PROJECT_NAME osgCMakeExample)
44
Original file line number Diff line number Diff line change 1- CMAKE_MINIMUM_REQUIRED (VERSION 3.0 FATAL_ERROR )
1+ CMAKE_MINIMUM_REQUIRED (VERSION 3.2 FATAL_ERROR )
22
33# Path to OpenSceneGraph
44SET (OSG_DIR "${CMAKE_SOURCE_DIR } /../.." )
You can’t perform that action at this time.
0 commit comments