mirror of
https://github.com/neovim/neovim.git
synced 2025-10-06 18:06:30 +00:00
build: various fixes
- simplify lua interpreter search - fix incorrect variable name in BuildLua.cmake - build PUC Lua with -O2 - silence non-mandatory find_package search for libuv - simplify Find modules - Prefer using the explicitly set CI_BUILD over relying on the environment variable "CI".
This commit is contained in:
@@ -2,7 +2,7 @@ add_library(main_lib INTERFACE)
|
||||
add_executable(nvim main.c)
|
||||
|
||||
add_library(libuv INTERFACE)
|
||||
find_package(libuv CONFIG)
|
||||
find_package(libuv CONFIG QUIET)
|
||||
if(TARGET libuv::uv_a)
|
||||
target_link_libraries(libuv INTERFACE libuv::uv_a)
|
||||
mark_as_advanced(libuv_DIR)
|
||||
@@ -392,7 +392,7 @@ else()
|
||||
endif()
|
||||
|
||||
# Log level (NVIM_LOG_DEBUG in log.h)
|
||||
if($ENV{CI})
|
||||
if(CI_BUILD)
|
||||
# Don't debug log on CI, it gets too verbose in the main build log.
|
||||
# TODO(bfredl): debug log level also exposes some errors with EXITFREE in ASAN build.
|
||||
else()
|
||||
@@ -703,6 +703,7 @@ if(WIN32)
|
||||
-D CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
|
||||
-D BINARY="${PROJECT_BINARY_DIR}/bin/nvim${CMAKE_EXECUTABLE_SUFFIX}"
|
||||
-D DST=${PROJECT_BINARY_DIR}/windows_runtime_deps
|
||||
-D CI_BUILD=${CI_BUILD}
|
||||
-P ${PROJECT_SOURCE_DIR}/cmake/WindowsDllCopy.cmake)
|
||||
add_dependencies(nvim_runtime_deps nvim_dll_deps)
|
||||
|
||||
|
Reference in New Issue
Block a user