diff options
| author | John Szakmeister <john@szakmeister.net> | 2015-02-25 05:05:18 -0500 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2015-02-25 05:05:18 -0500 |
| commit | 61c98e7e35b18081a8f723406d5ed5f241ddbc96 (patch) | |
| tree | 7db0f795072b8b4ca33136cd3cf1460d407fda4b | |
| parent | 56f371cb820107cf31c66be07b189818dbd527ee (diff) | |
| parent | e077f4ee99d7e24e6921b588640ccf87425f33eb (diff) | |
| download | rneovim-61c98e7e35b18081a8f723406d5ed5f241ddbc96.tar.gz rneovim-61c98e7e35b18081a8f723406d5ed5f241ddbc96.tar.bz2 rneovim-61c98e7e35b18081a8f723406d5ed5f241ddbc96.zip | |
Merge pull request #2053 from jszakmeister/fix-libuv-libraries
Fix collection of libuv dependent libraries.
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/FindLibUV.cmake | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index caf345de8c..ea577b9986 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") # Prefer our bundled versions of dependencies. set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies") list(INSERT CMAKE_PREFIX_PATH 0 ${DEPS_PREFIX}) +set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") # CMake tries to treat /sw and /opt/local as extension of the system path, but diff --git a/cmake/FindLibUV.cmake b/cmake/FindLibUV.cmake index 62acff5dbc..d7695d2c6d 100644 --- a/cmake/FindLibUV.cmake +++ b/cmake/FindLibUV.cmake @@ -39,7 +39,11 @@ find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES} mark_as_advanced(LIBUV_INCLUDE_DIR LIBUV_LIBRARY) -set(LIBUV_LIBRARIES ${LIBUV_LIBRARY}) +if(PC_LIBUV_LIBRARIES) + list(REMOVE_ITEM PC_LIBUV_LIBRARIES uv) +endif() + +set(LIBUV_LIBRARIES ${LIBUV_LIBRARY} ${PC_LIBUV_LIBRARIES}) set(LIBUV_INCLUDE_DIRS ${LIBUV_INCLUDE_DIR}) # Deal with the fact that libuv.pc is missing important dependency information. |