Skip to content

Commit

Permalink
deps: Remove libtickit as a project dependency
Browse files Browse the repository at this point in the history
Also update libtermkey version and fix the pkg-config search scripts.
  • Loading branch information
tarruda committed Feb 9, 2015
1 parent 28dcfcf commit 739a255
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 83 deletions.
2 changes: 1 addition & 1 deletion cmake/FindLibTermkey.cmake
Expand Up @@ -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)
Expand Down
48 changes: 0 additions & 48 deletions cmake/FindLibTickit.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion cmake/FindLibUnibilium.cmake
Expand Up @@ -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)
Expand Down
36 changes: 3 additions & 33 deletions third-party/CMakeLists.txt
Expand Up @@ -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})
Expand Down Expand Up @@ -69,13 +68,9 @@ set(LIBUNIBILIUM_URL https://github.com/mauke/unibilium/archive/520abbc8b26910e2
set(LIBUNIBILIUM_SHA1 c546e5e8861380f5c109a256f25c93419e4076bf)
set(LIBUNIBILIUM_MD5 d80d1fc45b22b1e92bebd5bf76e8a98b)

set(LIBTERMKEY_URL https://github.com/neovim/libtermkey/archive/7b3bdafdf589d08478f2493273d4d75636ecc183.tar.gz)
set(LIBTERMKEY_SHA1 28bfe54dfd9269910a132b51dee7725a2121578d)
set(LIBTERMKEY_MD5 f0bac9c2467cc80c821be937ea5c13bc)

set(LIBTICKIT_URL https://github.com/neovim/libtickit/archive/33f4afb3891df05955429acbf5b406dfe87ec22b.tar.gz)
set(LIBTICKIT_SHA1 3aab459b9fb3cd83e85ac2e08f05e5f162c8c9d2)
set(LIBTICKIT_MD5 19ee9271c16716620d0906db74158ec6)
set(LIBTERMKEY_URL https://github.com/neovim/libtermkey/archive/03fa59c3d7d335c759fd56444fa5006850afe07c.tar.gz)
set(LIBTERMKEY_SHA1 2022bd6a6b0f2ff208ef198ecf149cf1264c8ecd)
set(LIBTERMKEY_MD5 6946e069b2509e58ba1b82fb1af983a0)

if(USE_BUNDLED_LIBUNIBILIUM)
ExternalProject_Add(libunibilium
Expand Down Expand Up @@ -124,31 +119,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}
-DEXPECTED_MD5=${LIBTICKIT_MD5}
-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}
Expand Down

0 comments on commit 739a255

Please sign in to comment.