diff options
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | BUILD.md | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | cmake.config/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake.deps/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake.deps/cmake/GettextCMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake.deps/cmake/LibiconvCMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake.deps/cmake/LpegCMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake.deps/cmake/MarkdownParserCMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake.deps/cmake/TreesitterCMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake.deps/cmake/TreesitterParserCMakeLists.txt | 2 |
11 files changed, 12 insertions, 19 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e77485210e..ab313729b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,8 +41,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 env: - CMAKE_URL: 'https://cmake.org/files/v3.13/cmake-3.13.0-Linux-x86_64.sh' - CMAKE_VERSION: '3.13.0' + CMAKE_URL: 'https://cmake.org/files/v3.16/cmake-3.16.0-Linux-x86_64.sh' + CMAKE_VERSION: '3.16.0' steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup @@ -283,7 +283,7 @@ cmake --build build General requirements (see [#1469](https://github.com/neovim/neovim/issues/1469#issuecomment-63058312)): - Clang or GCC version 4.9+ -- CMake version 3.13+, built with TLS/SSL support +- CMake version 3.16+, built with TLS/SSL support - Optional: Get the latest CMake from an [installer](https://github.com/Kitware/CMake/releases) or the [Python package](https://pypi.org/project/cmake/) (`pip install cmake`) Platform-specific requirements are listed below. diff --git a/CMakeLists.txt b/CMakeLists.txt index 3112c84585..d8611c49a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,12 +6,7 @@ # - variable_watch https://cmake.org/cmake/help/latest/command/variable_watch.html # Version should match the tested CMAKE_URL in .github/workflows/build.yml. -cmake_minimum_required(VERSION 3.13) - -# Can be removed once minimum version is at least 3.15 -if(POLICY CMP0092) - cmake_policy(SET CMP0092 NEW) -endif() +cmake_minimum_required(VERSION 3.16) project(nvim C) diff --git a/cmake.config/CMakeLists.txt b/cmake.config/CMakeLists.txt index 3171f9e88c..aac8c4c27b 100644 --- a/cmake.config/CMakeLists.txt +++ b/cmake.config/CMakeLists.txt @@ -173,9 +173,7 @@ function(append_target_expression) ${ARGN}) set(TARGET_EXPRESSION "$<TARGET_PROPERTY:nvim_bin,${ARG_PROPERTY}>") - if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.15) - set(TARGET_EXPRESSION "$<REMOVE_DUPLICATES:${TARGET_EXPRESSION}>") - endif() + set(TARGET_EXPRESSION "$<REMOVE_DUPLICATES:${TARGET_EXPRESSION}>") set(TARGET_EXPRESSION "${ARG_PREFIX}$<JOIN:${TARGET_EXPRESSION}, ${ARG_PREFIX}>") set(VERSION_STRING "${VERSION_STRING} ${TARGET_EXPRESSION} " PARENT_SCOPE) diff --git a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt index bbd3694c58..96519429fb 100644 --- a/cmake.deps/CMakeLists.txt +++ b/cmake.deps/CMakeLists.txt @@ -1,5 +1,5 @@ # This is not meant to be included by the top-level. -cmake_minimum_required (VERSION 3.13) +cmake_minimum_required (VERSION 3.16) project(NVIM_DEPS C) if(POLICY CMP0135) diff --git a/cmake.deps/cmake/GettextCMakeLists.txt b/cmake.deps/cmake/GettextCMakeLists.txt index c36f3aada5..722420e830 100644 --- a/cmake.deps/cmake/GettextCMakeLists.txt +++ b/cmake.deps/cmake/GettextCMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(gettext C) add_compile_options(-w) diff --git a/cmake.deps/cmake/LibiconvCMakeLists.txt b/cmake.deps/cmake/LibiconvCMakeLists.txt index e62b479b6b..9181314883 100644 --- a/cmake.deps/cmake/LibiconvCMakeLists.txt +++ b/cmake.deps/cmake/LibiconvCMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(libiconv C) add_compile_options(-w) diff --git a/cmake.deps/cmake/LpegCMakeLists.txt b/cmake.deps/cmake/LpegCMakeLists.txt index 4dcf3a1b77..ac1da8c062 100644 --- a/cmake.deps/cmake/LpegCMakeLists.txt +++ b/cmake.deps/cmake/LpegCMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project (lpeg C) include(GNUInstallDirs) diff --git a/cmake.deps/cmake/MarkdownParserCMakeLists.txt b/cmake.deps/cmake/MarkdownParserCMakeLists.txt index 981bf4dfd7..504acb74a5 100644 --- a/cmake.deps/cmake/MarkdownParserCMakeLists.txt +++ b/cmake.deps/cmake/MarkdownParserCMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(${PARSERLANG} C) add_compile_options(-w) diff --git a/cmake.deps/cmake/TreesitterCMakeLists.txt b/cmake.deps/cmake/TreesitterCMakeLists.txt index 81ebfc4aed..3d3705c8ab 100644 --- a/cmake.deps/cmake/TreesitterCMakeLists.txt +++ b/cmake.deps/cmake/TreesitterCMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(treesitter C) add_compile_options(-w) diff --git a/cmake.deps/cmake/TreesitterParserCMakeLists.txt b/cmake.deps/cmake/TreesitterParserCMakeLists.txt index 0d4bbf0508..08b942a0ff 100644 --- a/cmake.deps/cmake/TreesitterParserCMakeLists.txt +++ b/cmake.deps/cmake/TreesitterParserCMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(parser C) add_compile_options(-w) |