diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-03-09 08:40:55 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2014-03-21 15:22:00 -0400 |
| commit | 1eed86883bff8a031d397ddd38b39fb307a31198 (patch) | |
| tree | aee588ea7aa856ecbe0fa382cedf6c0fc1ffb766 /src | |
| parent | 0b2f6a0cf4c50d86744b1d3d774103db39773b4c (diff) | |
| download | rneovim-1eed86883bff8a031d397ddd38b39fb307a31198.tar.gz rneovim-1eed86883bff8a031d397ddd38b39fb307a31198.tar.bz2 rneovim-1eed86883bff8a031d397ddd38b39fb307a31198.zip | |
Deal with the missing dependencies for libuv.
Since libuv.pc is broken at the moment, try to determine libuv's
dependencies ourselves. This ports most of the checks from libuv into
our CMake build, and fixes the build on other unix platforms.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86be94238a..e89672a91f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,3 +1,5 @@ +include(CheckLibraryExists) + file( GLOB NEOVIM_SOURCES *.c ) foreach(sfile ${NEOVIM_SOURCES}) @@ -25,25 +27,12 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang") endif() endif() -# The libraries we link against for nvim -set(NVIM_LINK_LIBRARIES - m - ${LIBUV_LIBRARIES} - ${LUAJIT_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT}) - -# Add any libraries needed for a specific platform -if(HAVE_CLOCK_GETTIME) - # Work around libuv.a not linking in rt. - list(APPEND NVIM_LINK_LIBRARIES rt) -endif(HAVE_CLOCK_GETTIME) +# Our dependencies come first. if (LibIntl_FOUND) list(APPEND NVIM_LINK_LIBRARIES ${LibIntl_LIBRARY}) endif() -include(CheckLibraryExists) - check_library_exists(curses tgetent "" HAVE_LIBCURSES) if (HAVE_LIBCURSES) list(APPEND NVIM_LINK_LIBRARIES curses) @@ -52,6 +41,13 @@ else() list(APPEND NVIM_LINK_LIBRARIES ${CURSES_LIBRARIES}) endif() +# Put these last on the link line, since multiple things may depend on them. +list(APPEND NVIM_LINK_LIBRARIES + ${LIBUV_LIBRARIES} + ${LUAJIT_LIBRARIES} + m + ${CMAKE_THREAD_LIBS_INIT}) + if(NOT DEFINED ENV{SKIP_EXEC}) add_executable(nvim ${NEOVIM_SOURCES} ${OS_SOURCES}) target_link_libraries(nvim ${NVIM_LINK_LIBRARIES}) |