diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-11 13:47:41 +0100 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-11 15:41:53 +0100 |
| commit | aa9baa019bb53d83625e0a296efc744ef351fd45 (patch) | |
| tree | ad4784925b8ed6e831a4b10628c650ba492356a0 | |
| parent | 077aa887ba94e93006feadc28a06c13c829d318a (diff) | |
| download | libnitrokey-aa9baa019bb53d83625e0a296efc744ef351fd45.tar.gz libnitrokey-aa9baa019bb53d83625e0a296efc744ef351fd45.tar.bz2 | |
Add tested Travis build configuration. Set proper hidapi url.
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | .travis.yml | 58 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
3 files changed, 60 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 4c898f5..1656b22 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,4 +6,4 @@ url = https://github.com/pybind/pybind11.git [submodule "hidapi"] path = hidapi - url = git@github.com:szszszsz/hidapi.git + url = https://github.com/szszszsz/hidapi.git diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..ba4465b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,58 @@ +language: generic +sudo: false +os: osx +env: CF= + +matrix: + include: +# - osx_image: xcode7.3 #default +# before_install: &brew +# - brew update +# - brew install hidapi + - osx_image: xcode6.4 + - osx_image: xcode8.2 + - os: linux + dist: trusty + env: COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5 CF=-DCOMPILE_TESTS=ON + addons: + apt: + packages: + - cmake + - libhidapi-dev + - g++-5 + sources: &sources + - ubuntu-toolchain-r-test + - os: linux + dist: trusty + env: COMPILER_NAME=gcc CXX=g++-6 CC=gcc-6 CF=-DCOMPILE_TESTS=ON + addons: + apt: + packages: + - cmake + - libhidapi-dev + - g++-6 + sources: *sources + - os: linux + dist: trusty + env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 CF=-DCOMPILE_TESTS=ON + addons: + apt: + packages: + - cmake + - libhidapi-dev + - g++-5 + - clang-3.8 + sources: *sources + + +install: + - mkdir -p build + - cd build +# - export CXXFLAGS="${CXX_FLAGS} -Wall -Wextra -Werror" # TODO enable when fixed + - ${CXX} --version || true + - cmake --version + - cmake .. ${CF} + +script: + - make -j2 +# - make test # TODO add library device-less tests
\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 46f5bee..46405a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.1) IF (UNIX) OPTION(USE_CLANG "Use CLang" FALSE) IF(USE_CLANG) |