Browse Source

Bump CMake minimum required version to 3.14.5.

Yao Wei Tjong 姚伟忠 6 years ago
parent
commit
46c6894d78

+ 1 - 1
CMakeLists.txt

@@ -21,7 +21,7 @@
 #
 #
 
 
 # Set CMake minimum version and CMake policy required by UrhoCommon module
 # Set CMake minimum version and CMake policy required by UrhoCommon module
-cmake_minimum_required (VERSION 3.2.3)
+cmake_minimum_required (VERSION 3.14.5)
 if (COMMAND cmake_policy)
 if (COMMAND cmake_policy)
     # Libraries linked via full path no longer produce linker search paths
     # Libraries linked via full path no longer produce linker search paths
     cmake_policy (SET CMP0003 NEW)
     cmake_policy (SET CMP0003 NEW)

+ 2 - 2
Docs/GettingStarted.dox

@@ -67,7 +67,7 @@ SIMD requirement can be eliminated by disabling the use of SIMD instruction set,
 
 
 The NEON instruction set will be used by default whenever it is available. See the ANDROID_ABI and RPI_ABI build options for more detail for Android and Raspberry-Pi platforms, respectively. The NEON instruction set is always used on iOS and tVOS platforms.
 The NEON instruction set will be used by default whenever it is available. See the ANDROID_ABI and RPI_ABI build options for more detail for Android and Raspberry-Pi platforms, respectively. The NEON instruction set is always used on iOS and tVOS platforms.
 
 
-CMake (https://www.cmake.org) is required to configure and generate the Urho3D project build tree. The minimum required version is 3.2.3 (or 3.4.1 on Apple platforms when LuaJIT is enabled). However, it is recommended to use the latest CMake version available, especially when targeting Apple platforms using its latest Xcode version available. This is because Apple is known to change the internal working of Xcode with little regards to other third party build tools, such as CMake.
+CMake (https://www.cmake.org) is required to configure and generate the Urho3D project build tree. The minimum required version is 3.14.5. However, it is recommended to use the latest CMake version available, especially when targeting Apple platforms using its latest Xcode version available. This is because Apple is known to change the internal working of Xcode with little regards to other third party build tools, such as CMake.
 
 
 \section Build_Scripts Build scripts
 \section Build_Scripts Build scripts
 
 
@@ -602,7 +602,7 @@ In your own project root directory, create a main CMakeLists.txt file and add th
 
 
 \code
 \code
 # Set CMake minimum version and CMake policy required by UrhoCommon module
 # Set CMake minimum version and CMake policy required by UrhoCommon module
-cmake_minimum_required (VERSION 3.2.3)
+cmake_minimum_required (VERSION 3.14.5)
 if (COMMAND cmake_policy)
 if (COMMAND cmake_policy)
     # Libraries linked via full path no longer produce linker search paths
     # Libraries linked via full path no longer produce linker search paths
     cmake_policy (SET CMP0003 NEW)
     cmake_policy (SET CMP0003 NEW)

+ 1 - 0
Docs/Urho3D.dox

@@ -1393,6 +1393,7 @@ From 1.7 to master:
 - Build system - integrate with Gradle build system and migration to use Kotlin for Android platform.
 - Build system - integrate with Gradle build system and migration to use Kotlin for Android platform.
 - Build system - introduce a new Emscripten-specific build option "EMSCRIPTEN_AUTO_SHELL" (default to TRUE), which cause the build system to automatically add an HTML shell-file if one is not explicitly given. Also set the default for "EMSCRIPTEN_WASM" build option to TRUE in order to align with the upstream EMCC compiler changes.
 - Build system - introduce a new Emscripten-specific build option "EMSCRIPTEN_AUTO_SHELL" (default to TRUE), which cause the build system to automatically add an HTML shell-file if one is not explicitly given. Also set the default for "EMSCRIPTEN_WASM" build option to TRUE in order to align with the upstream EMCC compiler changes.
 - Build system - the 'WIN32' build option for 'cmake_generic.sh' is renamed to 'MINGW' to be consistent with 'cmake_generic.bat'.
 - Build system - the 'WIN32' build option for 'cmake_generic.sh' is renamed to 'MINGW' to be consistent with 'cmake_generic.bat'.
+- Build system - CMake version 3.14.5 is now minimum version required for building Urho3D library on any host systems.
 
 
 */
 */
 
 

+ 1 - 1
Rakefile

@@ -649,7 +649,7 @@ def scaffolding dir, project = 'Scaffolding', target = 'Main'
   dir.gsub!(/\//, '\\') if ENV['OS']
   dir.gsub!(/\//, '\\') if ENV['OS']
   build_script = <<EOF
   build_script = <<EOF
 # Set CMake minimum version and CMake policy required by UrhoCommon module
 # Set CMake minimum version and CMake policy required by UrhoCommon module
-cmake_minimum_required (VERSION 3.2.3)
+cmake_minimum_required (VERSION 3.14.5)
 if (COMMAND cmake_policy)
 if (COMMAND cmake_policy)
     # Libraries linked via full path no longer produce linker search paths
     # Libraries linked via full path no longer produce linker search paths
     cmake_policy (SET CMP0003 NEW)
     cmake_policy (SET CMP0003 NEW)

+ 1 - 1
Source/Clang-Tools/CMakeLists.txt

@@ -28,7 +28,7 @@ if (CMAKE_PROJECT_NAME STREQUAL Urho3D)
     set_output_directories (${CMAKE_BINARY_DIR}/bin/tool/clang RUNTIME PDB)
     set_output_directories (${CMAKE_BINARY_DIR}/bin/tool/clang RUNTIME PDB)
 else ()
 else ()
     # Set CMake minimum version and CMake policy required by UrhoCommon module
     # Set CMake minimum version and CMake policy required by UrhoCommon module
-    cmake_minimum_required (VERSION 3.2.3)
+    cmake_minimum_required (VERSION 3.14.5)
     if (COMMAND cmake_policy)
     if (COMMAND cmake_policy)
         # Libraries linked via full path no longer produce linker search paths
         # Libraries linked via full path no longer produce linker search paths
         cmake_policy (SET CMP0003 NEW)
         cmake_policy (SET CMP0003 NEW)

+ 1 - 1
Source/ThirdParty/LuaJIT/CMakeLists.txt

@@ -28,7 +28,7 @@ if (NOT CMAKE_PROJECT_NAME STREQUAL Urho3D)
     if (APPLE)
     if (APPLE)
         cmake_minimum_required (VERSION 3.4.1)
         cmake_minimum_required (VERSION 3.4.1)
     else ()
     else ()
-        cmake_minimum_required (VERSION 3.2.3)
+        cmake_minimum_required (VERSION 3.14.5)
     endif ()
     endif ()
     if (COMMAND cmake_policy)
     if (COMMAND cmake_policy)
         # Libraries linked via full path no longer produce linker search paths
         # Libraries linked via full path no longer produce linker search paths

+ 1 - 1
Source/ThirdParty/LuaJIT/src/host/CMakeLists.txt

@@ -25,7 +25,7 @@ if (NOT CMAKE_PROJECT_NAME STREQUAL Urho3D)
     if (APPLE)
     if (APPLE)
         cmake_minimum_required (VERSION 3.4.1)
         cmake_minimum_required (VERSION 3.4.1)
     else ()
     else ()
-        cmake_minimum_required (VERSION 3.2.3)
+        cmake_minimum_required (VERSION 3.14.5)
     endif ()
     endif ()
     if (COMMAND cmake_policy)
     if (COMMAND cmake_policy)
         # Libraries linked via full path no longer produce linker search paths
         # Libraries linked via full path no longer produce linker search paths

+ 1 - 1
Source/ThirdParty/toluapp/src/bin/CMakeLists.txt

@@ -22,7 +22,7 @@
 
 
 if (NOT CMAKE_PROJECT_NAME STREQUAL Urho3D)
 if (NOT CMAKE_PROJECT_NAME STREQUAL Urho3D)
     # Set CMake minimum version and CMake policy required by UrhoCommon module
     # Set CMake minimum version and CMake policy required by UrhoCommon module
-    cmake_minimum_required (VERSION 3.2.3)
+    cmake_minimum_required (VERSION 3.14.5)
     if (COMMAND cmake_policy)
     if (COMMAND cmake_policy)
         # Libraries linked via full path no longer produce linker search paths
         # Libraries linked via full path no longer produce linker search paths
         cmake_policy (SET CMP0003 NEW)
         cmake_policy (SET CMP0003 NEW)

+ 1 - 1
Source/Tools/PackageTool/CMakeLists.txt

@@ -22,7 +22,7 @@
 
 
 if (NOT CMAKE_PROJECT_NAME STREQUAL Urho3D)
 if (NOT CMAKE_PROJECT_NAME STREQUAL Urho3D)
     # Set CMake minimum version and CMake policy required by UrhoCommon module
     # Set CMake minimum version and CMake policy required by UrhoCommon module
-    cmake_minimum_required (VERSION 3.2.3)
+    cmake_minimum_required (VERSION 3.14.5)
     if (COMMAND cmake_policy)
     if (COMMAND cmake_policy)
         # Libraries linked via full path no longer produce linker search paths
         # Libraries linked via full path no longer produce linker search paths
         cmake_policy (SET CMP0003 NEW)
         cmake_policy (SET CMP0003 NEW)

+ 1 - 1
android/launcher-app/CMakeLists.txt

@@ -21,7 +21,7 @@
 #
 #
 
 
 # Set CMake minimum version and CMake policy required by UrhoCommon module
 # Set CMake minimum version and CMake policy required by UrhoCommon module
-cmake_minimum_required (VERSION 3.2.3)
+cmake_minimum_required (VERSION 3.14.5)
 if (COMMAND cmake_policy)
 if (COMMAND cmake_policy)
     # Libraries linked via full path no longer produce linker search paths
     # Libraries linked via full path no longer produce linker search paths
     cmake_policy (SET CMP0003 NEW)
     cmake_policy (SET CMP0003 NEW)