wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: bump minimum cmake version to 3.13

Browse Source 
The benefits are primarily being able to use FetchContent, which allows
for a more flexible dependency handling. Other various quality-of-life
features such as `-B` and `-S` flags are also included.

This also removes broken `--version` generation as it does not work for
version 3.10 and 3.11 due to the `JOIN` generator expression.

Reference: https://github.com/neovim/neovim/issues/24004
This commit is contained in:
dundargoc 2023-10-14 13:12:48 +02:00 committed by dundargoc
parent 896b400bff
commit 7840760776
13 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -36,8 +36,8 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
timeout-minutes: 15 timeout-minutes: 15
env: env:
CMAKE_URL: 'https://cmake.org/files/v3.10/cmake-3.10.0-Linux-x86_64.sh' CMAKE_URL: 'https://cmake.org/files/v3.13/cmake-3.13.0-Linux-x86_64.sh'
CMAKE_VERSION: '3.10.0' CMAKE_VERSION: '3.13.0'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: ./.github/actions/setup - uses: ./.github/actions/setup

5
CMakeLists.txt
View File

@ -4,7 +4,7 @@
# pitfalls: https://izzys.casa/2019/02/everything-you-never-wanted-to-know-about-cmake/ # pitfalls: https://izzys.casa/2019/02/everything-you-never-wanted-to-know-about-cmake/
# Version should match the tested CMAKE_URL in .github/workflows/build.yml. # Version should match the tested CMAKE_URL in .github/workflows/build.yml.
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
# Can be removed once minimum version is at least 3.15 # Can be removed once minimum version is at least 3.15
if(POLICY CMP0092) if(POLICY CMP0092)
@ -13,9 +13,6 @@ endif()
project(nvim C) project(nvim C)
if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW)
endif()
if(POLICY CMP0135) if(POLICY CMP0135)
cmake_policy(SET CMP0135 NEW) cmake_policy(SET CMP0135 NEW)
endif() endif()

2
cmake.deps/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# This is not meant to be included by the top-level. # This is not meant to be included by the top-level.
cmake_minimum_required (VERSION 3.10) cmake_minimum_required (VERSION 3.13)
project(NVIM_DEPS C) project(NVIM_DEPS C)
if(POLICY CMP0135) if(POLICY CMP0135)

2
cmake.deps/cmake/GettextCMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
# Can be removed once minimum version is at least 3.15 # Can be removed once minimum version is at least 3.15
if(POLICY CMP0092) if(POLICY CMP0092)

3
cmake.deps/cmake/LibiconvCMakeLists.txt
View File

@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
# Can be removed once minimum version is at least 3.15 # Can be removed once minimum version is at least 3.15
if(POLICY CMP0092) if(POLICY CMP0092)
cmake_policy(SET CMP0092 NEW) cmake_policy(SET CMP0092 NEW)

2
cmake.deps/cmake/LibvtermCMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
# Can be removed once minimum version is at least 3.15 # Can be removed once minimum version is at least 3.15
if(POLICY CMP0092) if(POLICY CMP0092)
cmake_policy(SET CMP0092 NEW) cmake_policy(SET CMP0092 NEW)

2
cmake.deps/cmake/LpegCMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
project (lpeg C) project (lpeg C)
include(GNUInstallDirs) include(GNUInstallDirs)

2
cmake.deps/cmake/MarkdownParserCMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
# Can be removed once minimum version is at least 3.15 # Can be removed once minimum version is at least 3.15
if(POLICY CMP0092) if(POLICY CMP0092)
cmake_policy(SET CMP0092 NEW) cmake_policy(SET CMP0092 NEW)

2
cmake.deps/cmake/TreesitterCMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
# Can be removed once minimum version is at least 3.15 # Can be removed once minimum version is at least 3.15
if(POLICY CMP0092) if(POLICY CMP0092)
cmake_policy(SET CMP0092 NEW) cmake_policy(SET CMP0092 NEW)

2
cmake.deps/cmake/TreesitterParserCMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.13)
# Can be removed once minimum version is at least 3.15 # Can be removed once minimum version is at least 3.15
if(POLICY CMP0092) if(POLICY CMP0092)
cmake_policy(SET CMP0092 NEW) cmake_policy(SET CMP0092 NEW)

13
cmake/InstallHelpers.cmake
View File

@ -151,16 +151,3 @@ function(install_helper)
${RENAME}) ${RENAME})
endif() endif()
endfunction() endfunction()
# Without CONFIGURE_DEPENDS globbing reuses cached file tree on rebuild.
# For example it will ignore new files.
# CONFIGURE_DEPENDS was introduced in 3.12
function(glob_wrapper outvar)
if(${CMAKE_VERSION} VERSION_LESS 3.12)
file(GLOB ${outvar} ${ARGN})
else()
file(GLOB ${outvar} CONFIGURE_DEPENDS ${ARGN})
endif()
set(${outvar} ${${outvar}} PARENT_SCOPE)
endfunction()

10
runtime/CMakeLists.txt
View File

@ -24,12 +24,12 @@ add_custom_command(OUTPUT ${GENERATED_SYN_VIM}
${FUNCS_DATA} ${FUNCS_DATA}
) )
glob_wrapper(PACKAGES ${PROJECT_SOURCE_DIR}/runtime/pack/dist/opt/*) file(GLOB PACKAGES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/runtime/pack/dist/opt/*)
set(GENERATED_PACKAGE_TAGS) set(GENERATED_PACKAGE_TAGS)
foreach(PACKAGE ${PACKAGES}) foreach(PACKAGE ${PACKAGES})
get_filename_component(PACKNAME ${PACKAGE} NAME) get_filename_component(PACKNAME ${PACKAGE} NAME)
glob_wrapper("${PACKNAME}_DOC_FILES" ${PACKAGE}/doc/*.txt) file(GLOB "${PACKNAME}_DOC_FILES" CONFIGURE_DEPENDS ${PACKAGE}/doc/*.txt)
if(${PACKNAME}_DOC_FILES) if(${PACKNAME}_DOC_FILES)
file(MAKE_DIRECTORY ${GENERATED_PACKAGE_DIR}/${PACKNAME}) file(MAKE_DIRECTORY ${GENERATED_PACKAGE_DIR}/${PACKNAME})
add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags" add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
@ -57,7 +57,7 @@ foreach(PACKAGE ${PACKAGES})
endif() endif()
endforeach() endforeach()
glob_wrapper(DOCFILES ${PROJECT_SOURCE_DIR}/runtime/doc/*.txt) file(GLOB DOCFILES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/runtime/doc/*.txt)
set(BUILDDOCFILES) set(BUILDDOCFILES)
foreach(DF ${DOCFILES}) foreach(DF ${DOCFILES})
@ -119,11 +119,11 @@ install_helper(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/nvim.png FILES ${CMAKE_CURRENT_SOURCE_DIR}/nvim.png
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps) DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps)
glob_wrapper(RUNTIME_ROOT_FILES *.vim *.lua *.ico) file(GLOB RUNTIME_ROOT_FILES CONFIGURE_DEPENDS *.vim *.lua *.ico)
install_helper(FILES ${RUNTIME_ROOT_FILES} install_helper(FILES ${RUNTIME_ROOT_FILES}
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/) DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/)
glob_wrapper(RUNTIME_DIRS */) file(GLOB RUNTIME_DIRS CONFIGURE_DEPENDS */)
foreach(D ${RUNTIME_DIRS}) foreach(D ${RUNTIME_DIRS})
if(IS_DIRECTORY ${D}) if(IS_DIRECTORY ${D})
install_helper(DIRECTORY ${D} install_helper(DIRECTORY ${D}

38
src/nvim/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_library(main_lib INTERFACE) add_library(main_lib INTERFACE)
add_executable(nvim main.c) add_executable(nvim)
set_target_properties(nvim set_target_properties(nvim
PROPERTIES PROPERTIES
@ -20,7 +20,7 @@ if(WIN32)
target_compile_definitions(nlua0 PUBLIC LUA_BUILD_AS_DLL LUA_LIB) target_compile_definitions(nlua0 PUBLIC LUA_BUILD_AS_DLL LUA_LIB)
set_target_properties(nlua0 PROPERTIES ENABLE_EXPORTS TRUE) set_target_properties(nlua0 PROPERTIES ENABLE_EXPORTS TRUE)
elseif(APPLE) elseif(APPLE)
set_target_properties(nlua0 PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") target_link_options(nlua0 PRIVATE -undefined dynamic_lookup)
endif() endif()
find_package(Luv 1.43.0 REQUIRED) find_package(Luv 1.43.0 REQUIRED)
@ -155,7 +155,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
# Actually export symbols - symbols may not be visible even though # Actually export symbols - symbols may not be visible even though
# ENABLE_EXPORTS is set to true. See # ENABLE_EXPORTS is set to true. See
# https://github.com/neovim/neovim/issues/25295 # https://github.com/neovim/neovim/issues/25295
set_target_properties(nvim PROPERTIES LINK_FLAGS "-Wl,-export_dynamic") target_link_options(nvim PRIVATE "-Wl,-export_dynamic")
elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
target_link_libraries(main_lib INTERFACE pthread c++abi) target_link_libraries(main_lib INTERFACE pthread c++abi)
elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS") elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
@ -348,10 +348,10 @@ set(LUA_KEYMAP_MODULE_SOURCE ${NVIM_RUNTIME_DIR}/lua/vim/keymap.lua)
set(CHAR_BLOB_GENERATOR ${GENERATOR_DIR}/gen_char_blob.lua) set(CHAR_BLOB_GENERATOR ${GENERATOR_DIR}/gen_char_blob.lua)
set(LUAJIT_RUNTIME_DIR ${DEPS_PREFIX}/share/luajit-2.1/jit) set(LUAJIT_RUNTIME_DIR ${DEPS_PREFIX}/share/luajit-2.1/jit)
glob_wrapper(UNICODE_FILES ${UNICODE_DIR}/*.txt) file(GLOB UNICODE_FILES CONFIGURE_DEPENDS ${UNICODE_DIR}/*.txt)
glob_wrapper(API_HEADERS api/*.h) file(GLOB API_HEADERS CONFIGURE_DEPENDS api/*.h)
list(REMOVE_ITEM API_HEADERS ${CMAKE_CURRENT_LIST_DIR}/api/ui_events.in.h) list(REMOVE_ITEM API_HEADERS ${CMAKE_CURRENT_LIST_DIR}/api/ui_events.in.h)
glob_wrapper(MSGPACK_RPC_HEADERS msgpack_rpc/*.h) file(GLOB MSGPACK_RPC_HEADERS CONFIGURE_DEPENDS msgpack_rpc/*.h)
target_include_directories(main_lib INTERFACE ${GENERATED_DIR}) target_include_directories(main_lib INTERFACE ${GENERATED_DIR})
target_include_directories(main_lib INTERFACE ${CACHED_GENERATED_DIR}) target_include_directories(main_lib INTERFACE ${CACHED_GENERATED_DIR})
@ -367,12 +367,12 @@ file(MAKE_DIRECTORY ${TOUCHES_DIR})
file(MAKE_DIRECTORY ${GENERATED_DIR}) file(MAKE_DIRECTORY ${GENERATED_DIR})
file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}) file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR})
glob_wrapper(NVIM_SOURCES *.c) file(GLOB NVIM_SOURCES CONFIGURE_DEPENDS *.c)
glob_wrapper(NVIM_HEADERS *.h) file(GLOB NVIM_HEADERS CONFIGURE_DEPENDS *.h)
glob_wrapper(EXTERNAL_SOURCES ../xdiff/*.c ../mpack/*.c ../cjson/*.c ../klib/*.c ../termkey/*.c) file(GLOB EXTERNAL_SOURCES CONFIGURE_DEPENDS ../xdiff/*.c ../mpack/*.c ../cjson/*.c ../klib/*.c ../termkey/*.c)
glob_wrapper(EXTERNAL_HEADERS ../xdiff/*.h ../mpack/*.h ../cjson/*.h ../klib/*.h ../termkey/*.h) file(GLOB EXTERNAL_HEADERS CONFIGURE_DEPENDS ../xdiff/*.h ../mpack/*.h ../cjson/*.h ../klib/*.h ../termkey/*.h)
glob_wrapper(NLUA0_SOURCES ../mpack/*.c) file(GLOB NLUA0_SOURCES CONFIGURE_DEPENDS ../mpack/*.c)
if(PREFER_LUA) if(PREFER_LUA)
# luajit not used, use a vendored copy of the bit module # luajit not used, use a vendored copy of the bit module
@ -398,8 +398,8 @@ foreach(subdir
file(MAKE_DIRECTORY ${GENERATED_DIR}/${subdir}) file(MAKE_DIRECTORY ${GENERATED_DIR}/${subdir})
file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}/${subdir}) file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}/${subdir})
glob_wrapper(sources ${subdir}/*.c) file(GLOB sources CONFIGURE_DEPENDS ${subdir}/*.c)
glob_wrapper(headers ${subdir}/*.h) file(GLOB headers CONFIGURE_DEPENDS ${subdir}/*.h)
list(APPEND NVIM_SOURCES ${sources}) list(APPEND NVIM_SOURCES ${sources})
list(APPEND NVIM_HEADERS ${headers}) list(APPEND NVIM_HEADERS ${headers})
endforeach() endforeach()
@ -432,10 +432,10 @@ list(REMOVE_ITEM NVIM_SOURCES ${to_remove})
# xdiff, mpack, lua-cjson, termkey: inlined external project, we don't maintain it. #9306 # xdiff, mpack, lua-cjson, termkey: inlined external project, we don't maintain it. #9306
if(MSVC) if(MSVC)
set_source_files_properties( set_source_files_properties(
${EXTERNAL_SOURCES} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -wd4090 -wd4244 -wd4267") ${EXTERNAL_SOURCES} PROPERTIES COMPILE_OPTIONS "-wd4090;-wd4244;-wd4267")
else() else()
set_source_files_properties( set_source_files_properties(
${EXTERNAL_SOURCES} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-conversion -Wno-missing-noreturn -Wno-missing-format-attribute -Wno-double-promotion -Wno-strict-prototypes -Wno-misleading-indentation -Wno-sign-compare -Wno-implicit-fallthrough -Wno-missing-prototypes -Wno-missing-field-initializers") ${EXTERNAL_SOURCES} PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-missing-noreturn;-Wno-missing-format-attribute;-Wno-double-promotion;-Wno-strict-prototypes;-Wno-misleading-indentation;-Wno-sign-compare;-Wno-implicit-fallthrough;-Wno-missing-prototypes;-Wno-missing-field-initializers")
endif() endif()
# Log level (NVIM_LOG_DEBUG in log.h) # Log level (NVIM_LOG_DEBUG in log.h)
@ -685,7 +685,7 @@ endforeach()
if(PREFER_LUA) if(PREFER_LUA)
message(STATUS "luajit not used, skipping unit tests") message(STATUS "luajit not used, skipping unit tests")
else() else()
glob_wrapper(UNIT_TEST_FIXTURES ${PROJECT_SOURCE_DIR}/test/unit/fixtures/*.c) file(GLOB UNIT_TEST_FIXTURES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/test/unit/fixtures/*.c)
target_sources(nvim PRIVATE ${UNIT_TEST_FIXTURES}) target_sources(nvim PRIVATE ${UNIT_TEST_FIXTURES})
target_compile_definitions(nvim PRIVATE UNIT_TESTING) target_compile_definitions(nvim PRIVATE UNIT_TESTING)
endif() endif()
@ -764,7 +764,7 @@ file(MAKE_DIRECTORY ${BINARY_LIB_DIR})
# install treesitter parser if bundled # install treesitter parser if bundled
if(EXISTS ${DEPS_PREFIX}/lib/nvim/parser) if(EXISTS ${DEPS_PREFIX}/lib/nvim/parser)
glob_wrapper(TREESITTER_PARSERS ${DEPS_PREFIX}/lib/nvim/parser/*) file(GLOB TREESITTER_PARSERS CONFIGURE_DEPENDS ${DEPS_PREFIX}/lib/nvim/parser/*)
foreach(parser_lib ${TREESITTER_PARSERS}) foreach(parser_lib ${TREESITTER_PARSERS})
file(COPY ${parser_lib} DESTINATION ${BINARY_LIB_DIR}/parser) file(COPY ${parser_lib} DESTINATION ${BINARY_LIB_DIR}/parser)
endforeach() endforeach()
@ -910,9 +910,9 @@ set(VIMDOC_FILES
${NVIM_RUNTIME_DIR}/doc/treesitter.txt ${NVIM_RUNTIME_DIR}/doc/treesitter.txt
) )
glob_wrapper(API_SOURCES ${PROJECT_SOURCE_DIR}/src/nvim/api/*.c) file(GLOB API_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/src/nvim/api/*.c)
glob_wrapper(LUA_SOURCES file(GLOB LUA_SOURCES CONFIGURE_DEPENDS
${NVIM_RUNTIME_DIR}/lua/vim/*.lua ${NVIM_RUNTIME_DIR}/lua/vim/*.lua
${NVIM_RUNTIME_DIR}/lua/vim/filetype/*.lua ${NVIM_RUNTIME_DIR}/lua/vim/filetype/*.lua
${NVIM_RUNTIME_DIR}/lua/vim/lsp/*.lua ${NVIM_RUNTIME_DIR}/lua/vim/lsp/*.lua