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 uninteresting variables as advanced (#22208)

Browse Source 
Only the most important variables should be shown by default.
This commit is contained in:
dundargoc 2023-02-10 20:20:18 +01:00 committed by GitHub
parent 84328bae08
commit 4c64cbe99f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake.config/CMakeLists.txt
View File

@ -156,7 +156,6 @@ if (NOT "${HAVE_BE64TOH}")
endif() endif()
endif() endif()
# generate configuration header and update include directories
configure_file ( configure_file (
"${PROJECT_SOURCE_DIR}/cmake.config/config.h.in" "${PROJECT_SOURCE_DIR}/cmake.config/config.h.in"
"${PROJECT_BINARY_DIR}/cmake.config/auto/config.h" "${PROJECT_BINARY_DIR}/cmake.config/auto/config.h"
@ -176,21 +175,21 @@ file(GENERATE
OUTPUT "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef.h" OUTPUT "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef.h"
INPUT "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef.h.gen") INPUT "${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef.h.gen")
# generate pathdef.c find_program(WHOAMI_PRG whoami)
find_program(WHOAMI_PROG whoami) find_program(HOSTNAME_PRG hostname)
find_program(HOSTNAME_PROG hostname) mark_as_advanced(HOSTNAME_PRG WHOAMI_PRG)
if (DEFINED ENV{USERNAME}) if (DEFINED ENV{USERNAME})
set(USERNAME $ENV{USERNAME}) set(USERNAME $ENV{USERNAME})
elseif (NOT DEFINED USERNAME AND EXISTS ${WHOAMI_PROG}) elseif (NOT DEFINED USERNAME AND EXISTS ${WHOAMI_PRG})
execute_process(COMMAND ${WHOAMI_PROG} execute_process(COMMAND ${WHOAMI_PRG}
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE USERNAME) OUTPUT_VARIABLE USERNAME)
endif() endif()
if (DEFINED ENV{HOSTNAME}) if (DEFINED ENV{HOSTNAME})
set(HOSTNAME $ENV{HOSTNAME}) set(HOSTNAME $ENV{HOSTNAME})
elseif (EXISTS ${HOSTNAME_PROG}) elseif (EXISTS ${HOSTNAME_PRG})
execute_process(COMMAND ${HOSTNAME_PROG} execute_process(COMMAND ${HOSTNAME_PRG}
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
OUTPUT_VARIABLE HOSTNAME) OUTPUT_VARIABLE HOSTNAME)
endif() endif()

2
cmake/FindIconv.cmake
View File

@ -19,3 +19,5 @@ if(ICONV_LIBRARY)
endif() endif()
libfind_process(Iconv) libfind_process(Iconv)
mark_as_advanced(ICONV_LIBRARY)

2
cmake/Findlibvterm.cmake
View File

@ -18,3 +18,5 @@ find_package_handle_standard_args(libvterm
add_library(libvterm INTERFACE) add_library(libvterm INTERFACE)
target_include_directories(libvterm SYSTEM BEFORE INTERFACE ${LIBVTERM_INCLUDE_DIR}) target_include_directories(libvterm SYSTEM BEFORE INTERFACE ${LIBVTERM_INCLUDE_DIR})
target_link_libraries(libvterm INTERFACE ${LIBVTERM_LIBRARY}) target_link_libraries(libvterm INTERFACE ${LIBVTERM_LIBRARY})
mark_as_advanced(LIBVTERM_INCLUDE_DIR LIBVTERM_LIBRARY)

2
cmake/Findunibilium.cmake
View File

@ -25,3 +25,5 @@ list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${UNIBILIUM_LIBRARY}")
if(UNIBI_HAS_VAR_FROM) if(UNIBI_HAS_VAR_FROM)
target_compile_definitions(unibilium INTERFACE NVIM_UNIBI_HAS_VAR_FROM) target_compile_definitions(unibilium INTERFACE NVIM_UNIBI_HAS_VAR_FROM)
endif() endif()
mark_as_advanced(UNIBILIUM_INCLUDE_DIR UNIBILIUM_LIBRARY)

6
src/nvim/CMakeLists.txt
View File

@ -252,11 +252,11 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
target_compile_definitions(main_lib INTERFACE _GNU_SOURCE) target_compile_definitions(main_lib INTERFACE _GNU_SOURCE)
endif() endif()
option(USE_GCOV "Enable gcov support" OFF) option(ENABLE_GCOV "Enable gcov support" OFF)
if(USE_GCOV) if(ENABLE_GCOV)
if(CLANG_TSAN) if(CLANG_TSAN)
# GCOV and TSAN results in false data race reports # GCOV and TSAN results in false data race reports
message(FATAL_ERROR "USE_GCOV cannot be used with CLANG_TSAN") message(FATAL_ERROR "ENABLE_GCOV cannot be used with CLANG_TSAN")
endif() endif()
message(STATUS "Enabling gcov support") message(STATUS "Enabling gcov support")
target_compile_options(main_lib INTERFACE --coverage) target_compile_options(main_lib INTERFACE --coverage)

9
src/nvim/po/CMakeLists.txt
View File

@ -1,9 +1,14 @@
find_package(Gettext REQUIRED) find_package(Gettext REQUIRED)
find_program(XGETTEXT_PRG xgettext) find_program(XGETTEXT_PRG xgettext)
find_program(ICONV_PRG iconv) find_program(ICONV_PRG iconv)
mark_as_advanced(
GETTEXT_MSGFMT_EXECUTABLE
GETTEXT_MSGMERGE_EXECUTABLE
ICONV_PRG
XGETTEXT_PRG)
option(LANGUAGES "Localizations to build") option(ENABLE_LANGUAGES "Localizations to build" ON)
if(NOT LANGUAGES) if(ENABLE_LANGUAGES)
set(LANGUAGES set(LANGUAGES
af af
ca ca