aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbfredl <bjorn.linse@gmail.com>2023-03-06 00:05:42 +0100
committerGitHub <noreply@github.com>2023-03-06 00:05:42 +0100
commit1b49841969ae8a573b1917aab8af5deb9f8e6b66 (patch)
tree2ad9758568691e3f721dd0fa7ff8f49341813d5d /src
parentca3bc56a3b1b3454498a4a23c0d700486d554077 (diff)
parentda0c66bcddbe4e6ebc72357c9f6c5de75e176744 (diff)
downloadrneovim-1b49841969ae8a573b1917aab8af5deb9f8e6b66.tar.gz
rneovim-1b49841969ae8a573b1917aab8af5deb9f8e6b66.tar.bz2
rneovim-1b49841969ae8a573b1917aab8af5deb9f8e6b66.zip
Merge pull request #22539 from dundargoc/build/luv
build: remove workaround for incorrectly packaged libluv
Diffstat (limited to 'src')
-rwxr-xr-xsrc/nvim/CMakeLists.txt8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 61530f5a7b..51e0727cd5 100755
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -14,12 +14,8 @@ else()
endif()
find_package(Libluv 1.43.0 REQUIRED)
-target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBLUV_INCLUDE_DIRS})
-# Use "luv" as imported library, to work around CMake using "-lluv" for
-# "luv.so". #10407
-add_library(luv UNKNOWN IMPORTED)
-set_target_properties(luv PROPERTIES IMPORTED_LOCATION ${LIBLUV_LIBRARIES})
-target_link_libraries(main_lib INTERFACE luv)
+target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBLUV_INCLUDE_DIR})
+target_link_libraries(main_lib INTERFACE ${LIBLUV_LIBRARY})
find_package(Iconv REQUIRED)
find_package(Libtermkey 0.22 REQUIRED)