kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

build: mark CMake variables advanced #31412

Browse Source 
The variables are not marked as advanced, thus they appear in e.g. `ccmake`.
This commit is contained in:
Eisuke Kawashima 2024-12-10 09:10:27 +09:00 committed by GitHub
parent 3bb2d02759
commit 1b90f4a9c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -187,6 +187,7 @@ if(NOT PREFER_LUA)
find_program(LUA_PRG NAMES luajit) find_program(LUA_PRG NAMES luajit)
endif() endif()
find_program(LUA_PRG NAMES lua5.1 lua5.2 lua) find_program(LUA_PRG NAMES lua5.1 lua5.2 lua)
mark_as_advanced(LUA_PRG)
if(NOT LUA_PRG) if(NOT LUA_PRG)
message(FATAL_ERROR "Failed to find a Lua 5.1-compatible interpreter") message(FATAL_ERROR "Failed to find a Lua 5.1-compatible interpreter")
endif() endif()
@ -200,6 +201,7 @@ message(STATUS "Using Lua interpreter: ${LUA_PRG}")
if(NOT LUA_GEN_PRG) if(NOT LUA_GEN_PRG)
set(LUA_GEN_PRG "${LUA_PRG}" CACHE FILEPATH "Path to the lua used for code generation.") set(LUA_GEN_PRG "${LUA_PRG}" CACHE FILEPATH "Path to the lua used for code generation.")
endif() endif()
mark_as_advanced(LUA_GEN_PRG)
message(STATUS "Using Lua interpreter for code generation: ${LUA_GEN_PRG}") message(STATUS "Using Lua interpreter for code generation: ${LUA_GEN_PRG}")
option(COMPILE_LUA "Pre-compile Lua sources into bytecode (for sources that are included in the binary)" ON) option(COMPILE_LUA "Pre-compile Lua sources into bytecode (for sources that are included in the binary)" ON)
@ -219,6 +221,7 @@ if(COMPILE_LUA AND NOT WIN32)
endif() endif()
endif() endif()
endif() endif()
mark_as_advanced(LUAC_PRG)
if(LUAC_PRG) if(LUAC_PRG)
message(STATUS "Using Lua compiler: ${LUAC_PRG}") message(STATUS "Using Lua compiler: ${LUAC_PRG}")
endif() endif()
@ -229,7 +232,9 @@ if(CI_LINT)
set(LINT_REQUIRED "REQUIRED") set(LINT_REQUIRED "REQUIRED")
endif() endif()
find_program(SHELLCHECK_PRG shellcheck ${LINT_REQUIRED}) find_program(SHELLCHECK_PRG shellcheck ${LINT_REQUIRED})
mark_as_advanced(SHELLCHECK_PRG)
find_program(STYLUA_PRG stylua ${LINT_REQUIRED}) find_program(STYLUA_PRG stylua ${LINT_REQUIRED})
mark_as_advanced(STYLUA_PRG)
set(STYLUA_DIRS runtime scripts src test contrib) set(STYLUA_DIRS runtime scripts src test contrib)

2
cmake/Deps.cmake
View File

@ -19,6 +19,7 @@ if(APPLE)
endif() endif()
find_program(CACHE_PRG NAMES ccache sccache) find_program(CACHE_PRG NAMES ccache sccache)
mark_as_advanced(CACHE_PRG)
if(CACHE_PRG) if(CACHE_PRG)
set(CMAKE_C_COMPILER_LAUNCHER ${CMAKE_COMMAND} -E env CCACHE_SLOPPINESS=pch_defines,time_macros ${CACHE_PRG}) set(CMAKE_C_COMPILER_LAUNCHER ${CMAKE_COMMAND} -E env CCACHE_SLOPPINESS=pch_defines,time_macros ${CACHE_PRG})
list(APPEND DEPS_CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER_LAUNCHER:STRING=${CMAKE_C_COMPILER_LAUNCHER}) list(APPEND DEPS_CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER_LAUNCHER:STRING=${CMAKE_C_COMPILER_LAUNCHER})
@ -27,6 +28,7 @@ endif()
# MAKE_PRG # MAKE_PRG
if(UNIX) if(UNIX)
find_program(MAKE_PRG NAMES gmake make) find_program(MAKE_PRG NAMES gmake make)
mark_as_advanced(MAKE_PRG)
if(NOT MAKE_PRG) if(NOT MAKE_PRG)
message(FATAL_ERROR "GNU Make is required to build the dependencies.") message(FATAL_ERROR "GNU Make is required to build the dependencies.")
else() else()

1
src/nvim/CMakeLists.txt
View File

@ -826,6 +826,7 @@ target_link_libraries(libnvim PRIVATE main_lib PUBLIC libuv)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
find_program(CLANG_TIDY_PRG clang-tidy) find_program(CLANG_TIDY_PRG clang-tidy)
mark_as_advanced(CLANG_TIDY_PRG)
set(EXCLUDE_CLANG_TIDY typval_encode.c.h ui_events.in.h) set(EXCLUDE_CLANG_TIDY typval_encode.c.h ui_events.in.h)
if(WIN32) if(WIN32)
list(APPEND EXCLUDE_CLANG_TIDY list(APPEND EXCLUDE_CLANG_TIDY