aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-06-29 21:49:49 +0200
committerGitHub <noreply@github.com>2019-06-29 21:49:49 +0200
commit9875372607cb5afd21780b3917b0ed6899098e7c (patch)
tree4f020b9f3be812339e9ebe4edd46f93c8bd56792
parent5031e329866e4fe34f926e05a45a20c936b68208 (diff)
downloadrneovim-9875372607cb5afd21780b3917b0ed6899098e7c.tar.gz
rneovim-9875372607cb5afd21780b3917b0ed6899098e7c.tar.bz2
rneovim-9875372607cb5afd21780b3917b0ed6899098e7c.zip
build: FindLibLUV: use PkgConfig (#10359)
Apparently forgotten in c83926cd0. - Also LIMIT_SEARCH was never used. - Also add LIBLUV_DEFINITIONS, as used with other Find modules.
-rw-r--r--cmake/FindLibLUV.cmake13
1 files changed, 9 insertions, 4 deletions
diff --git a/cmake/FindLibLUV.cmake b/cmake/FindLibLUV.cmake
index 619f6dfcab..66f827214e 100644
--- a/cmake/FindLibLUV.cmake
+++ b/cmake/FindLibLUV.cmake
@@ -4,9 +4,15 @@
# LIBLUV_INCLUDE_DIRS - The libluv include directories
# LIBLUV_LIBRARIES - The libraries needed to use libluv
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_LIBLUV QUIET luv)
+endif()
+
+set(LIBLUV_DEFINITIONS ${PC_LIBLUV_CFLAGS_OTHER})
+
find_path(LIBLUV_INCLUDE_DIR luv/luv.h
- PATHS ${PC_LIBLUV_INCLUDEDIR} ${PC_LIBLUV_INCLUDE_DIRS}
- ${LIMIT_SEARCH})
+ PATHS ${PC_LIBLUV_INCLUDEDIR} ${PC_LIBLUV_INCLUDE_DIRS})
# If we're asked to use static linkage, add libluv.a as a preferred library name.
if(LIBLUV_USE_STATIC)
@@ -17,8 +23,7 @@ endif()
list(APPEND LIBLUV_NAMES luv)
find_library(LIBLUV_LIBRARY NAMES ${LIBLUV_NAMES}
- HINTS ${PC_LIBLUV_LIBDIR} ${PC_LIBLUV_LIBRARY_DIRS}
- ${LIMIT_SEARCH})
+ HINTS ${PC_LIBLUV_LIBDIR} ${PC_LIBLUV_LIBRARY_DIRS})
set(LIBLUV_LIBRARIES ${LIBLUV_LIBRARY})
set(LIBLUV_INCLUDE_DIRS ${LIBLUV_INCLUDE_DIR})