Permalink
Browse files

Prepares env and compilers

  • Loading branch information...
kpp committed Aug 10, 2015
1 parent 09fc462 commit de82cfd2da56e443ee07f920c1a8fe034e006d17
Showing with 22 additions and 19 deletions.
  1. +6 −1 .travis.yml
  2. +3 −0 .travis/linux/before_install.sh
  3. +11 −0 .travis/osx/before_install.sh
  4. +2 −6 CMakeLists.txt
  5. +0 −12 cmake/FindTINFO.cmake
View
@@ -6,6 +6,7 @@ compiler:
os:
- linux
- osx
sudo: false
cache:
@@ -29,6 +30,10 @@ branches:
- develop
- /^.*travis.*$/
matrix:
allow_failures:
- os: osx
env:
matrix: # fix all scripts (e.g. install-dependencies.sh) if you rename LLVM_USE[On/Off]
- USE_LLVM=Off
@@ -43,7 +48,7 @@ env:
BUILD_TYPE=Coverage
before_install:
- pip install --user cpp-coveralls
- source .travis/${TRAVIS_OS_NAME}/before_install.sh
before_script:
- mkdir -p build
@@ -0,0 +1,3 @@
#!/bin/bash
pip install --user cpp-coveralls
@@ -0,0 +1,11 @@
#!/bin/bash
if [[ "${CC}" == "gcc" ]]; then
export CC=gcc-4.8
export CXX=g++-4.8
fi
function brew_upgrade { brew outdated $1 || brew upgrade $1; }
brew update
brew install readline
View
@@ -8,7 +8,6 @@ project(llst)
find_package(Threads REQUIRED QUIET)
find_package(READLINE)
find_package(TINFO)
find_package(LLVM ${LLVM_PACKAGE_VERSION} EXACT)
find_package(POD2MAN)
find_package(GZIP REQUIRED)
@@ -34,14 +33,11 @@ else()
endif()
if (USE_READLINE)
if (READLINE_FOUND AND TINFO_FOUND)
if (READLINE_FOUND)
message(STATUS "Using readline library")
set_source_files_properties(src/CompletionEngine.cpp PROPERTIES COMPILE_DEFINITIONS USE_READLINE)
set (READLINE_LIBS_TO_LINK ${READLINE_LIBRARIES} ${TINFO_LIBRARIES})
set (READLINE_LIBS_TO_LINK ${READLINE_LIBRARIES})
else()
if(NOT TINFO_FOUND)
message(SEND_ERROR "Library readline depends on tinfo.\nYou may configure with -DUSE_READLINE=OFF.")
endif()
if(NOT READLINE_FOUND)
message(SEND_ERROR "Library readline is not found.\nYou may configure with -DUSE_READLINE=OFF.")
endif()
View
@@ -1,12 +0,0 @@
# Find libtinfo (developer's library for the low-level terminfo library)
# Export variables:
# TINFO_FOUND
# TINFO_INCLUDE_DIRS
# TINFO_LIBRARIES
find_library(TINFO_LIBRARIES NAMES tinfo)
mark_as_advanced(TINFO_LIBRARIES)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS( tinfo DEFAULT_MSG TINFO_LIBRARIES )

0 comments on commit de82cfd

Please sign in to comment.