diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-09-04 00:00:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-04 00:00:26 +0200 |
| commit | c50951a4d0cf480aa138a2ed2bd2deedebeb0dec (patch) | |
| tree | e679e3a76da94dc11bbe5d6c051ea3af6c6fbb69 /src | |
| parent | af899971b90426853313ab6b1f3b78a3dac8262a (diff) | |
| download | rneovim-c50951a4d0cf480aa138a2ed2bd2deedebeb0dec.tar.gz rneovim-c50951a4d0cf480aa138a2ed2bd2deedebeb0dec.tar.bz2 rneovim-c50951a4d0cf480aa138a2ed2bd2deedebeb0dec.zip | |
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".
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 7436e21d69..535058bd7d 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -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) |