diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-04-19 00:47:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-19 00:47:15 +0200 |
| commit | 0a3645a72307afa563683a6e06c544810e0b65eb (patch) | |
| tree | 30a55717f8f4ae191e57514698bfbb77dc8119f6 | |
| parent | 59fed8bb6457eb6c5204dc39a49d7ea0e1781482 (diff) | |
| download | rneovim-0a3645a72307afa563683a6e06c544810e0b65eb.tar.gz rneovim-0a3645a72307afa563683a6e06c544810e0b65eb.tar.bz2 rneovim-0a3645a72307afa563683a6e06c544810e0b65eb.zip | |
build: find system luv on ubuntu
Also use the system luv in CI for the with-external-deps job.
| -rw-r--r-- | .github/workflows/test.yml | 7 | ||||
| -rw-r--r-- | cmake/FindLibluv.cmake | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8215a79b35..7e2b981690 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -383,10 +383,10 @@ jobs: lua-filesystem \ lua-lpeg \ lua-mpack \ - luajit + luajit \ + lua-luv-dev # libtree-sitter-dev \ - # libvterm-dev \ - # lua-luv-dev + # libvterm-dev # Remove comments from packages once we start using these external # dependencies. @@ -400,7 +400,6 @@ jobs: # bundled versions for these with the hopes of being able to remove them # later on. cmake -S cmake.deps -B .deps -G Ninja -D USE_BUNDLED=OFF \ - -D USE_BUNDLED_LUV=ON \ -D USE_BUNDLED_LIBVTERM=ON \ -D USE_BUNDLED_TS=ON cmake --build .deps diff --git a/cmake/FindLibluv.cmake b/cmake/FindLibluv.cmake index 3dfc536024..d402b26447 100644 --- a/cmake/FindLibluv.cmake +++ b/cmake/FindLibluv.cmake @@ -1,5 +1,14 @@ find_path(LIBLUV_INCLUDE_DIR luv/luv.h) -find_library(LIBLUV_LIBRARY NAMES luv_a luv libluv_a luv.so) +find_library(LIBLUV_LIBRARY NAMES luv_a luv libluv_a) + +# Ubuntu-specific workaround to find system paths +function(ubuntu) + set(CMAKE_FIND_LIBRARY_PREFIXES "") + find_path(LIBLUV_INCLUDE_DIR luv/luv.h PATH_SUFFIXES lua5.1) + find_library(LIBLUV_LIBRARY NAMES luv PATH_SUFFIXES lua/5.1) +endfunction() +ubuntu() + find_package_handle_standard_args(Libluv DEFAULT_MSG LIBLUV_LIBRARY LIBLUV_INCLUDE_DIR) mark_as_advanced(LIBLUV_INCLUDE_DIR LIBLUV_LIBRARY) |