From fd254e6789bfc00467c94bd210434dc74a7c1f6a Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Thu, 16 Feb 2017 11:30:25 +0100 Subject: Hidapi added as a submodule Signed-off-by: Szczepan Zalega --- .gitmodules | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 6e2a0ec..4c898f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "pybind11"] path = python_bindings/pybind11 url = https://github.com/pybind/pybind11.git +[submodule "hidapi"] + path = hidapi + url = git@github.com:szszszsz/hidapi.git -- cgit v1.2.3 From aa9baa019bb53d83625e0a296efc744ef351fd45 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 11 Mar 2017 13:47:41 +0100 Subject: Add tested Travis build configuration. Set proper hidapi url. Signed-off-by: Szczepan Zalega --- .gitmodules | 2 +- .travis.yml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ CMakeLists.txt | 2 +- 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 .travis.yml (limited to '.gitmodules') 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) -- cgit v1.2.3 From ac6b9c18ef55f4cd36e85069cf0cf82c14e04404 Mon Sep 17 00:00:00 2001 From: Szczepan Zalega Date: Sat, 11 Mar 2017 16:53:44 +0100 Subject: Cleanup modules Remove unused PyBind11 Update hidapi git path Signed-off-by: Szczepan Zalega --- .gitmodules | 5 +---- python_bindings/pybind11 | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 160000 python_bindings/pybind11 (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 1656b22..4608496 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "unittest/Catch"] path = unittest/Catch url = https://github.com/philsquared/Catch.git -[submodule "pybind11"] - path = python_bindings/pybind11 - url = https://github.com/pybind/pybind11.git [submodule "hidapi"] path = hidapi - url = https://github.com/szszszsz/hidapi.git + url = https://github.com/Nitrokey/hidapi.git diff --git a/python_bindings/pybind11 b/python_bindings/pybind11 deleted file mode 160000 index 1f66a58..0000000 --- a/python_bindings/pybind11 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1f66a584278dfd1ad88be19d5e4996302793a191 -- cgit v1.2.3