p
/
xK
1
1
Fork 0
Code Issues 1 Pull Requests Releases 9 Wiki Activity

Update Travis CI and bump CMake

This commit is contained in:
Přemysl Eric Janouch 2015-12-09 21:00:44 +01:00
parent 6a72c7382b
commit a0becea2fc
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -1,3 +1,5 @@
sudo: required
dist: trusty
language: c language: c
notifications: notifications:
irc: irc:
@ -25,9 +27,12 @@ compiler:
before_install: before_install:
# We need this PPA for a recent version of libedit # We need this PPA for a recent version of libedit
- sudo add-apt-repository ppa:ondrej/php5-5.6 -y - 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 - sudo apt-get update -qq
install: 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: before_script:
- mkdir build - mkdir build
- cd build - cd build

8
CMakeLists.txt
View File

@ -1,5 +1,5 @@
project (uirc3 C) project (uirc3 C)
cmake_minimum_required (VERSION 2.8.5) cmake_minimum_required (VERSION 2.8.11)
# Options # Options
option (WANT_READLINE "Use GNU Readline for the UI (better)" ON) 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 (sources ${target_name} SOURCES)
get_target_property (libraries ${target_name} LINK_LIBRARIES) 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}) set (test test-${target_name})
add_executable (${test} ${sources}) add_executable (${test} ${sources})
target_link_libraries (${test} ${libraries}) target_link_libraries (${test} ${libraries})