Skip to content

Commit cd27a53

Browse files
committed
Require CMake 3.0
All policies up to CMP0050 have been verified compatible (after far more tweaking than I'd have liked)
1 parent 5ef4471 commit cd27a53

4 files changed

Lines changed: 11 additions & 31 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 0)
1313
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
1414
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1515

16-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
16+
CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
1717

1818
if(COMMAND cmake_policy)
1919
# INTERPROCEDURAL_OPTIMIZATION is enforced when enabled.
@@ -888,22 +888,8 @@ IF(DEFINED LIB_POSTFIX)
888888
# Use LIB_POSTFIX if defined
889889
SET(OSG_INSTALL_LIBDIR lib${LIB_POSTFIX})
890890
ELSE()
891-
IF(CMAKE_VERSION VERSION_LESS "2.8.5")
892-
IF(UNIX AND NOT WIN32 AND NOT APPLE)
893-
IF(CMAKE_SIZEOF_VOID_P MATCHES "8")
894-
SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
895-
MARK_AS_ADVANCED(LIB_POSTFIX)
896-
ENDIF()
897-
ENDIF()
898-
IF(NOT DEFINED LIB_POSTFIX)
899-
SET(LIB_POSTFIX "")
900-
ENDIF()
901-
SET(OSG_INSTALL_LIBDIR lib${LIB_POSTFIX})
902-
ELSE()
903-
# Use the GNU standard installation directories for CMake >= 2.8.5
904-
INCLUDE(GNUInstallDirs)
905-
SET(OSG_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
906-
ENDIF()
891+
INCLUDE(GNUInstallDirs)
892+
SET(OSG_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR})
907893
ENDIF()
908894
IF(NOT DEFINED LIB_POSTFIX)
909895
SET(LIB_POSTFIX "")

PlatformSpecifics/Android/android.toolchain.cmake

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210

211211
# Modified by Lasse Oorni and Yao Wei Tjong for Urho3D
212212

213-
cmake_minimum_required( VERSION 2.6.3 )
213+
cmake_minimum_required( VERSION 3.0 )
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
216216
if( CMAKE_HOST_WIN32 )
@@ -854,20 +854,16 @@ else()
854854
unset( __realApiLevel )
855855
endif()
856856
set( ANDROID_NATIVE_API_LEVEL "${ANDROID_NATIVE_API_LEVEL}" CACHE STRING "Android API level for native code" FORCE )
857-
if( CMAKE_VERSION VERSION_GREATER "2.8" )
858-
list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS )
859-
set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
860-
endif()
857+
list( SORT ANDROID_SUPPORTED_NATIVE_API_LEVELS )
858+
set_property( CACHE ANDROID_NATIVE_API_LEVEL PROPERTY STRINGS ${ANDROID_SUPPORTED_NATIVE_API_LEVELS} )
861859
endif()
862860
unset( __levelIdx )
863861

864862

865863
# remember target ABI
866864
set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE )
867-
if( CMAKE_VERSION VERSION_GREATER "2.8" )
868-
list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME} )
869-
set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME}} )
870-
endif()
865+
list( SORT ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME} )
866+
set_property( CACHE ANDROID_ABI PROPERTY STRINGS ${ANDROID_SUPPORTED_ABIS_${ANDROID_ARCH_NAME}} )
871867

872868

873869
# runtime choice (STL, rtti, exceptions)
@@ -1162,9 +1158,7 @@ if( NOT CMAKE_C_COMPILER )
11621158
endif()
11631159

11641160
set( _CMAKE_TOOLCHAIN_PREFIX "${ANDROID_TOOLCHAIN_MACHINE_NAME}-" )
1165-
if( CMAKE_VERSION VERSION_LESS 2.8.5 )
1166-
set( CMAKE_ASM_COMPILER_ARG1 "-c" )
1167-
endif()
1161+
set( CMAKE_ASM_COMPILER_ARG1 "-c" )
11681162
if( APPLE )
11691163
find_program( CMAKE_INSTALL_NAME_TOOL NAMES install_name_tool )
11701164
if( NOT CMAKE_INSTALL_NAME_TOOL )

examples/osgCMakeExample/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8)
1+
cmake_minimum_required(VERSION 3.0)
22

33
SET(PROJECT_NAME osgCMakeExample)
44

examples/osgemscripten/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
1+
CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
22

33
# Path to OpenSceneGraph
44
SET(OSG_DIR "${CMAKE_SOURCE_DIR}/../..")

0 commit comments

Comments
 (0)