From e8c1d7bc2c50704afe2c51ffb0c204f2bba4426c Mon Sep 17 00:00:00 2001 From: halx99 Date: Wed, 21 Apr 2021 14:05:44 +0800 Subject: [PATCH] Set cmake min version to 3.10 [ci build] --- CMakeLists.txt | 2 +- cocos/platform/android/CMakeLists.txt | 2 -- extensions/scripting/lua-bindings/proj.android/CMakeLists.txt | 1 - external/CMakeLists.txt | 2 +- external/ConvertUTF/CMakeLists.txt | 1 - external/android-specific/cpufeatures/CMakeLists.txt | 1 - external/astc/CMakeLists.txt | 1 - external/bullet/CMakeLists.txt | 1 - external/chipmunk/CMakeLists.txt | 2 +- external/clipper/CMakeLists.txt | 1 - external/curl/CMakeLists.txt | 1 - external/edtaa3func/CMakeLists.txt | 1 - external/fastlz/CMakeLists.txt | 1 - external/freetype/CMakeLists.txt | 1 - external/glad/CMakeLists.txt | 1 - external/glfw3/CMakeLists.txt | 1 - external/glsl-optimizer/CMakeLists.txt | 1 - external/lua/luajit/CMakeLists.txt | 1 - external/lua/plainlua/CMakeLists.txt | 1 - external/lua/tolua/CMakeLists.txt | 1 - external/lz4/CMakeLists.txt | 1 - external/md5/CMakeLists.txt | 1 - external/ogg/CMakeLists.txt | 1 - external/openal/CMakeLists.txt | 1 - external/openssl/CMakeLists.txt | 1 - external/png/CMakeLists.txt | 1 - external/poly2tri/CMakeLists.txt | 1 - external/pugixml/CMakeLists.txt | 1 - external/recast/CMakeLists.txt | 1 - external/unzip/CMakeLists.txt | 1 - external/webp/CMakeLists.txt | 1 - external/win32-specific/iconv/CMakeLists.txt | 1 - external/zlib/CMakeLists.txt | 1 - templates/cpp-template-default/CMakeLists.txt | 2 +- templates/lua-template-default/CMakeLists.txt | 2 +- tests/cpp-empty-test/CMakeLists.txt | 2 +- tests/cpp-tests/CMakeLists.txt | 2 +- tests/fairygui-tests/CMakeLists.txt | 2 +- tests/lua-empty-test/project/CMakeLists.txt | 2 +- tests/lua-tests/project/CMakeLists.txt | 2 +- 40 files changed, 10 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f31d4b2bb..f14bd4f1ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ # build engine library and all tests -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) project(engine-x) diff --git a/cocos/platform/android/CMakeLists.txt b/cocos/platform/android/CMakeLists.txt index 609317806d..a1a3bf2dde 100644 --- a/cocos/platform/android/CMakeLists.txt +++ b/cocos/platform/android/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.6) - # need to whole-archive this lib set(target_name cpp_android_spec) diff --git a/extensions/scripting/lua-bindings/proj.android/CMakeLists.txt b/extensions/scripting/lua-bindings/proj.android/CMakeLists.txt index 3556f5388f..51ac9a0266 100644 --- a/extensions/scripting/lua-bindings/proj.android/CMakeLists.txt +++ b/extensions/scripting/lua-bindings/proj.android/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) # need to whole-archive this lib set(target_name lua_android_spec) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 83e58054ac..f740dcb6b8 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) + project(external) if(NOT APPLE) diff --git a/external/ConvertUTF/CMakeLists.txt b/external/ConvertUTF/CMakeLists.txt index d4468c59c8..3c196f34d2 100644 --- a/external/ConvertUTF/CMakeLists.txt +++ b/external/ConvertUTF/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name convertUTF) set(target_name ${lib_name}) diff --git a/external/android-specific/cpufeatures/CMakeLists.txt b/external/android-specific/cpufeatures/CMakeLists.txt index 66afc8a620..47681fff4b 100644 --- a/external/android-specific/cpufeatures/CMakeLists.txt +++ b/external/android-specific/cpufeatures/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name cpufeatures) set(target_name ${lib_name}) diff --git a/external/astc/CMakeLists.txt b/external/astc/CMakeLists.txt index 1d29e80a08..208c205121 100644 --- a/external/astc/CMakeLists.txt +++ b/external/astc/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name astc) set(target_name ${lib_name}) diff --git a/external/bullet/CMakeLists.txt b/external/bullet/CMakeLists.txt index 8612912bf5..a0dc3bb265 100644 --- a/external/bullet/CMakeLists.txt +++ b/external/bullet/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name bullet) set(target_name ${lib_name}) diff --git a/external/chipmunk/CMakeLists.txt b/external/chipmunk/CMakeLists.txt index 0faf5412f1..5b45c8e5a2 100644 --- a/external/chipmunk/CMakeLists.txt +++ b/external/chipmunk/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) project(chipmunk) diff --git a/external/clipper/CMakeLists.txt b/external/clipper/CMakeLists.txt index 1ead0401ad..d40d46a810 100644 --- a/external/clipper/CMakeLists.txt +++ b/external/clipper/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name clipper) set(target_name ${lib_name}) diff --git a/external/curl/CMakeLists.txt b/external/curl/CMakeLists.txt index cb02b5a4f8..a05c7de56c 100644 --- a/external/curl/CMakeLists.txt +++ b/external/curl/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name curl) set(target_name ext_${lib_name}) diff --git a/external/edtaa3func/CMakeLists.txt b/external/edtaa3func/CMakeLists.txt index 51e0018102..74593c71e3 100644 --- a/external/edtaa3func/CMakeLists.txt +++ b/external/edtaa3func/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name edtaa3func) set(target_name ${lib_name}) diff --git a/external/fastlz/CMakeLists.txt b/external/fastlz/CMakeLists.txt index 0169c256b8..3e8212699e 100644 --- a/external/fastlz/CMakeLists.txt +++ b/external/fastlz/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name fastlz) set(target_name ${lib_name}) diff --git a/external/freetype/CMakeLists.txt b/external/freetype/CMakeLists.txt index 9736a8d578..2014395d98 100644 --- a/external/freetype/CMakeLists.txt +++ b/external/freetype/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name freetype) set(target_name ext_${lib_name}) diff --git a/external/glad/CMakeLists.txt b/external/glad/CMakeLists.txt index b6c0cd5539..2a1987d125 100644 --- a/external/glad/CMakeLists.txt +++ b/external/glad/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name glad) set(target_name ${lib_name}) diff --git a/external/glfw3/CMakeLists.txt b/external/glfw3/CMakeLists.txt index c685250c24..43fbc93414 100644 --- a/external/glfw3/CMakeLists.txt +++ b/external/glfw3/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name glfw3) set(target_name ext_${lib_name}) diff --git a/external/glsl-optimizer/CMakeLists.txt b/external/glsl-optimizer/CMakeLists.txt index cf1b9485ca..8eb8493c49 100644 --- a/external/glsl-optimizer/CMakeLists.txt +++ b/external/glsl-optimizer/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name glsl_optimizer) set(target_name ext_${lib_name}) diff --git a/external/lua/luajit/CMakeLists.txt b/external/lua/luajit/CMakeLists.txt index 943df5a088..8cac658b63 100644 --- a/external/lua/luajit/CMakeLists.txt +++ b/external/lua/luajit/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name luajit) set(target_name ${lib_name}) diff --git a/external/lua/plainlua/CMakeLists.txt b/external/lua/plainlua/CMakeLists.txt index 83a68ffb52..1208789b5b 100644 --- a/external/lua/plainlua/CMakeLists.txt +++ b/external/lua/plainlua/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(LUA_SRC_PATH ${CMAKE_CURRENT_LIST_DIR}/lua-${LUA_VERSION}/src) diff --git a/external/lua/tolua/CMakeLists.txt b/external/lua/tolua/CMakeLists.txt index bbc901b23c..a49f762cf4 100644 --- a/external/lua/tolua/CMakeLists.txt +++ b/external/lua/tolua/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name tolua) set(target_name ${lib_name}) diff --git a/external/lz4/CMakeLists.txt b/external/lz4/CMakeLists.txt index be55b3166d..bdf7e56a42 100644 --- a/external/lz4/CMakeLists.txt +++ b/external/lz4/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name lz4) set(target_name ${lib_name}) diff --git a/external/md5/CMakeLists.txt b/external/md5/CMakeLists.txt index 315ed77d36..551c15cf2e 100644 --- a/external/md5/CMakeLists.txt +++ b/external/md5/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name md5) set(target_name ${lib_name}) diff --git a/external/ogg/CMakeLists.txt b/external/ogg/CMakeLists.txt index 1fac7f9d99..6b7bb851b0 100644 --- a/external/ogg/CMakeLists.txt +++ b/external/ogg/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name ogg) set(target_name ${lib_name}) diff --git a/external/openal/CMakeLists.txt b/external/openal/CMakeLists.txt index 458251e802..bfb7ee956a 100644 --- a/external/openal/CMakeLists.txt +++ b/external/openal/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name openal) set(target_name ext_${lib_name}) diff --git a/external/openssl/CMakeLists.txt b/external/openssl/CMakeLists.txt index 326a9cdb75..d6f4f3745b 100644 --- a/external/openssl/CMakeLists.txt +++ b/external/openssl/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name openssl) diff --git a/external/png/CMakeLists.txt b/external/png/CMakeLists.txt index a3dfd90137..76ddb52711 100644 --- a/external/png/CMakeLists.txt +++ b/external/png/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name png) set(target_name ${lib_name}) diff --git a/external/poly2tri/CMakeLists.txt b/external/poly2tri/CMakeLists.txt index 22321fe702..3965ab7881 100644 --- a/external/poly2tri/CMakeLists.txt +++ b/external/poly2tri/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name poly2tri) set(target_name ${lib_name}) diff --git a/external/pugixml/CMakeLists.txt b/external/pugixml/CMakeLists.txt index 6cd8b0b5f5..d238181107 100644 --- a/external/pugixml/CMakeLists.txt +++ b/external/pugixml/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name pugixml) set(target_name ${lib_name}) diff --git a/external/recast/CMakeLists.txt b/external/recast/CMakeLists.txt index 0df5cb2ec7..ba67d21193 100644 --- a/external/recast/CMakeLists.txt +++ b/external/recast/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name recast) set(target_name ${lib_name}) diff --git a/external/unzip/CMakeLists.txt b/external/unzip/CMakeLists.txt index b1b8196cfb..cd353ebcc2 100644 --- a/external/unzip/CMakeLists.txt +++ b/external/unzip/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name unzip) set(target_name ${lib_name}) diff --git a/external/webp/CMakeLists.txt b/external/webp/CMakeLists.txt index 2505441caf..c519ee5baf 100644 --- a/external/webp/CMakeLists.txt +++ b/external/webp/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name webp) set(target_name ${lib_name}) diff --git a/external/win32-specific/iconv/CMakeLists.txt b/external/win32-specific/iconv/CMakeLists.txt index e85b105786..088de883b7 100644 --- a/external/win32-specific/iconv/CMakeLists.txt +++ b/external/win32-specific/iconv/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name iconv) set(target_name ext_${lib_name}) diff --git a/external/zlib/CMakeLists.txt b/external/zlib/CMakeLists.txt index fa9fc55d7d..639cb292a0 100644 --- a/external/zlib/CMakeLists.txt +++ b/external/zlib/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_minimum_required(VERSION 3.6) set(lib_name zlib) set(target_name ext_${lib_name}) diff --git a/templates/cpp-template-default/CMakeLists.txt b/templates/cpp-template-default/CMakeLists.txt index 49e18e476c..a147a8ad1e 100644 --- a/templates/cpp-template-default/CMakeLists.txt +++ b/templates/cpp-template-default/CMakeLists.txt @@ -23,7 +23,7 @@ # THE SOFTWARE. # ****************************************************************************/ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) set(APP_NAME HelloCpp) diff --git a/templates/lua-template-default/CMakeLists.txt b/templates/lua-template-default/CMakeLists.txt index 692186d22a..95dd1c4084 100644 --- a/templates/lua-template-default/CMakeLists.txt +++ b/templates/lua-template-default/CMakeLists.txt @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # ****************************************************************************/ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) set(APP_NAME HelloLua) diff --git a/tests/cpp-empty-test/CMakeLists.txt b/tests/cpp-empty-test/CMakeLists.txt index 873d4f3c9a..65e5963e8a 100644 --- a/tests/cpp-empty-test/CMakeLists.txt +++ b/tests/cpp-empty-test/CMakeLists.txt @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # ****************************************************************************/ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) set(APP_NAME cpp-empty-test) diff --git a/tests/cpp-tests/CMakeLists.txt b/tests/cpp-tests/CMakeLists.txt index 09649f45fd..604545bdf8 100644 --- a/tests/cpp-tests/CMakeLists.txt +++ b/tests/cpp-tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) set(APP_NAME cpp-tests) diff --git a/tests/fairygui-tests/CMakeLists.txt b/tests/fairygui-tests/CMakeLists.txt index 1cf608f448..8b641559e5 100644 --- a/tests/fairygui-tests/CMakeLists.txt +++ b/tests/fairygui-tests/CMakeLists.txt @@ -21,7 +21,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # ****************************************************************************/ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) set(APP_NAME fairygui-tests) diff --git a/tests/lua-empty-test/project/CMakeLists.txt b/tests/lua-empty-test/project/CMakeLists.txt index 0bed054bd4..9a1601b2df 100644 --- a/tests/lua-empty-test/project/CMakeLists.txt +++ b/tests/lua-empty-test/project/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) set(APP_NAME lua-empty-test) diff --git a/tests/lua-tests/project/CMakeLists.txt b/tests/lua-tests/project/CMakeLists.txt index a3f6d47376..9f3df49c50 100644 --- a/tests/lua-tests/project/CMakeLists.txt +++ b/tests/lua-tests/project/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.10) set(APP_NAME lua-tests)