diff options
| author | Přemysl Janouch <p.janouch@gmail.com> | 2015-12-09 21:00:44 +0100 |
|---|---|---|
| committer | Přemysl Janouch <p.janouch@gmail.com> | 2015-12-09 21:07:01 +0100 |
| commit | a0becea2fc809f8741b43026099f5648f624370e (patch) | |
| tree | 5749c765c03fe7dbfd8b14c786b2596e1690d101 | |
| parent | 6a72c7382bdd18c4e25ec528299f3c27ec3b9468 (diff) | |
| download | xK-a0becea2fc809f8741b43026099f5648f624370e.tar.gz xK-a0becea2fc809f8741b43026099f5648f624370e.tar.xz xK-a0becea2fc809f8741b43026099f5648f624370e.zip | |
Update Travis CI and bump CMake
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | CMakeLists.txt | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index fc34c79..36726f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +sudo: required +dist: trusty language: c notifications: irc: @@ -25,9 +27,12 @@ compiler: before_install: # We need this PPA for a recent version of libedit - sudo add-apt-repository ppa:ondrej/php5-5.6 -y + # We need this PPA for Lua 5.3 + - sudo add-apt-repository ppa:vbernat/haproxy-1.6 -y - sudo apt-get update -qq install: - - sudo apt-get install -y help2man libedit-dev expect + - sudo apt-get install -y libncursesw5-dev libreadline-dev libedit-dev + liblua5.3-dev help2man expect before_script: - mkdir build - cd build diff --git a/CMakeLists.txt b/CMakeLists.txt index 11e615f..ecbabb2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project (uirc3 C) -cmake_minimum_required (VERSION 2.8.5) +cmake_minimum_required (VERSION 2.8.11) # Options option (WANT_READLINE "Use GNU Readline for the UI (better)" ON) @@ -127,12 +127,6 @@ function (make_tests_for target_name) get_target_property (sources ${target_name} SOURCES) get_target_property (libraries ${target_name} LINK_LIBRARIES) - # Unfortunately the property is a 2.8.11 feature however we need to - # support at least 2.8.7 for now because of Travis CI - if (NOT libraries) - set (libraries ${project_libraries}) - endif (NOT libraries) - set (test test-${target_name}) add_executable (${test} ${sources}) target_link_libraries (${test} ${libraries}) |