pt
/
neovim
mirror of https://github.com/neovim/neovim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: remove config-specific find_package search for libuv 

Having two separate find_package calls makes it harder to maintain.
This commit is contained in:
dundargoc 2023-12-07 13:49:02 +01:00 committed by dundargoc
parent dd81e1e334
commit 8be24fed8f
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/FindLibuv.cmake
View File

@ -1,5 +1,5 @@
find_path2(LIBUV_INCLUDE_DIR uv.h)
find_library2(LIBUV_LIBRARY NAMES uv_a uv)
find_library2(LIBUV_LIBRARY NAMES uv_a uv libuv)
set(LIBUV_LIBRARIES ${LIBUV_LIBRARY})
@ -41,10 +41,12 @@ endif()
if(WIN32)
# check_library_exists() does not work for Win32 API calls in X86 due to name
# mangling calling conventions
list(APPEND LIBUV_LIBRARIES iphlpapi)
list(APPEND LIBUV_LIBRARIES psapi)
list(APPEND LIBUV_LIBRARIES userenv)
list(APPEND LIBUV_LIBRARIES ws2_32)
list(APPEND LIBUV_LIBRARIES
iphlpapi
psapi
userenv
ws2_32
dbghelp)
endif()
find_package(Threads)

14
src/nvim/CMakeLists.txt
View File

@ -11,17 +11,9 @@ set_target_properties(nvim
#-------------------------------------------------------------------------------
add_library(libuv INTERFACE)
find_package(libuv CONFIG QUIET)
if(TARGET libuv::uv_a)
target_link_libraries(libuv INTERFACE libuv::uv_a)
mark_as_advanced(libuv_DIR)
else()
# Fall back to find module for libuv versions older than v1.45.0 which don't
# provide a config file
find_package(Libuv 1.28.0 REQUIRED MODULE)
target_include_directories(libuv SYSTEM BEFORE INTERFACE ${LIBUV_INCLUDE_DIR})
target_link_libraries(libuv INTERFACE ${LIBUV_LIBRARIES})
endif()
find_package(Libuv 1.28.0 REQUIRED)
target_include_directories(libuv SYSTEM BEFORE INTERFACE ${LIBUV_INCLUDE_DIR})
target_link_libraries(libuv INTERFACE ${LIBUV_LIBRARIES})
add_library(nlua0 MODULE)
if(WIN32)