diff options
| -rw-r--r-- | cmake/FindLibTermkey.cmake | 2 | ||||
| -rw-r--r-- | cmake/FindLibTickit.cmake | 48 | ||||
| -rw-r--r-- | cmake/FindLibUnibilium.cmake | 2 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 32 |
4 files changed, 4 insertions, 80 deletions
diff --git a/cmake/FindLibTermkey.cmake b/cmake/FindLibTermkey.cmake index 533f168fe9..e5ec132f85 100644 --- a/cmake/FindLibTermkey.cmake +++ b/cmake/FindLibTermkey.cmake @@ -8,7 +8,7 @@ find_package(PkgConfig) if(NOT LIBTERMKEY_USE_BUNDLED) find_package(PkgConfig) if (PKG_CONFIG_FOUND) - pkg_check_modules(PC_LIBTERMKEY QUIET libtermkey) + pkg_check_modules(PC_LIBTERMKEY QUIET termkey) endif() else() set(PC_LIBTERMKEY_INCLUDEDIR) diff --git a/cmake/FindLibTickit.cmake b/cmake/FindLibTickit.cmake deleted file mode 100644 index c20bf4f74f..0000000000 --- a/cmake/FindLibTickit.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - Try to find libtickit -# Once done this will define -# LIBTICKIT_FOUND - System has libtickit -# LIBTICKIT_INCLUDE_DIRS - The libtickit include directories -# LIBTICKIT_LIBRARIES - The libraries needed to use libtickit - -find_package(PkgConfig) -if(NOT LIBTICKIT_USE_BUNDLED) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) - pkg_check_modules(PC_LIBTICKIT QUIET libtickit) - endif() -else() - set(PC_LIBTICKIT_INCLUDEDIR) - set(PC_LIBTICKIT_INCLUDE_DIRS) - set(PC_LIBTICKIT_LIBDIR) - set(PC_LIBTICKIT_LIBRARY_DIRS) - set(LIMIT_SEARCH NO_DEFAULT_PATH) -endif() - -set(LIBTICKIT_DEFINITIONS ${PC_LIBTICKIT_CFLAGS_OTHER}) - -find_path(LIBTICKIT_INCLUDE_DIR tickit.h - PATHS ${PC_LIBTICKIT_INCLUDEDIR} ${PC_LIBTICKIT_INCLUDE_DIRS} - ${LIMIT_SEARCH}) - -# If we're asked to use static linkage, add libuv.a as a preferred library name. -if(LIBTICKIT_USE_STATIC) - list(APPEND LIBTICKIT_NAMES - "${CMAKE_STATIC_LIBRARY_PREFIX}tickit${CMAKE_STATIC_LIBRARY_SUFFIX}") -endif() - -list(APPEND LIBTICKIT_NAMES tickit) - -find_library(LIBTICKIT_LIBRARY NAMES ${LIBTICKIT_NAMES} - HINTS ${PC_LIBTICKIT_LIBDIR} ${PC_LIBTICKIT_LIBRARY_DIRS} - ${LIMIT_SEARCH}) - -set(LIBTICKIT_LIBRARIES ${LIBTICKIT_LIBRARY}) -set(LIBTICKIT_INCLUDE_DIRS ${LIBTICKIT_INCLUDE_DIR}) - -include(FindPackageHandleStandardArgs) -# handle the QUIETLY and REQUIRED arguments and set LIBTICKIT_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args(LibTickit DEFAULT_MSG - LIBTICKIT_LIBRARY LIBTICKIT_INCLUDE_DIR) - -mark_as_advanced(LIBTICKIT_INCLUDE_DIR LIBTICKIT_LIBRARY) diff --git a/cmake/FindLibUnibilium.cmake b/cmake/FindLibUnibilium.cmake index aace9a40d5..6aafd07c90 100644 --- a/cmake/FindLibUnibilium.cmake +++ b/cmake/FindLibUnibilium.cmake @@ -8,7 +8,7 @@ find_package(PkgConfig) if(NOT LIBUNIBILIUM_USE_BUNDLED) find_package(PkgConfig) if (PKG_CONFIG_FOUND) - pkg_check_modules(PC_LIBUNIBILIUM QUIET libunibilium) + pkg_check_modules(PC_LIBUNIBILIUM QUIET unibilium) endif() else() set(PC_LIBUNIBILIUM_INCLUDEDIR) diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 46955d5e8f..1d56ba1adb 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -12,7 +12,6 @@ option(USE_BUNDLED "Use bundled dependencies." ON) option(USE_BUNDLED_LIBUNIBILIUM "Use the bundled libunibilium." ${USE_BUNDLED}) option(USE_BUNDLED_LIBTERMKEY "Use the bundled libtermkey." ${USE_BUNDLED}) -option(USE_BUNDLED_LIBTICKIT "Use the bundled libtickit." ${USE_BUNDLED}) option(USE_BUNDLED_LIBUV "Use the bundled libuv." ${USE_BUNDLED}) option(USE_BUNDLED_MSGPACK "Use the bundled msgpack." ${USE_BUNDLED}) option(USE_BUNDLED_LUAJIT "Use the bundled version of luajit." ${USE_BUNDLED}) @@ -64,11 +63,8 @@ set(LUAROCKS_SHA1 61a894fd5d61987bf7e7f9c3e0c5de16ba4b68c4) set(LIBUNIBILIUM_URL https://github.com/mauke/unibilium/archive/520abbc8b26910e2580619f669b5cc2c4ef7f864.tar.gz) set(LIBUNIBILIUM_SHA1 c546e5e8861380f5c109a256f25c93419e4076bf) -set(LIBTERMKEY_URL https://github.com/neovim/libtermkey/archive/7b3bdafdf589d08478f2493273d4d75636ecc183.tar.gz) -set(LIBTERMKEY_SHA1 28bfe54dfd9269910a132b51dee7725a2121578d) - -set(LIBTICKIT_URL https://github.com/neovim/libtickit/archive/33f4afb3891df05955429acbf5b406dfe87ec22b.tar.gz) -set(LIBTICKIT_SHA1 3aab459b9fb3cd83e85ac2e08f05e5f162c8c9d2) +set(LIBTERMKEY_URL https://github.com/neovim/libtermkey/archive/8c0cb7108cc63218ea19aa898968eede19e19603.tar.gz) +set(LIBTERMKEY_SHA1 54e8b6914dab10d4467d2a563f80053a99849fcb) if(USE_BUNDLED_LIBUNIBILIUM) ExternalProject_Add(libunibilium @@ -115,30 +111,6 @@ if(USE_BUNDLED_LIBTERMKEY) add_dependencies(libtermkey libunibilium) endif() -if(USE_BUNDLED_LIBTICKIT) - ExternalProject_Add(libtickit - PREFIX ${DEPS_BUILD_DIR} - URL ${LIBTICKIT_URL} - DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libtickit - DOWNLOAD_COMMAND ${CMAKE_COMMAND} - -DPREFIX=${DEPS_BUILD_DIR} - -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libtickit - -DURL=${LIBTICKIT_URL} - -DEXPECTED_SHA1=${LIBTICKIT_SHA1} - -DTARGET=libtickit - -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake - CONFIGURE_COMMAND "" - BUILD_IN_SOURCE 1 - BUILD_COMMAND "" - INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} - PREFIX=${DEPS_INSTALL_DIR} - PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig - CFLAGS=-fPIC - install) - list(APPEND THIRD_PARTY_DEPS libtickit) - add_dependencies(libtickit libtermkey) -endif() - if(USE_BUNDLED_LIBUV) ExternalProject_Add(libuv PREFIX ${DEPS_BUILD_DIR} |