From 980924bcf85cb010c3430277fe5d93d7e801cb58 Mon Sep 17 00:00:00 2001 From: thelsing Date: Wed, 18 Dec 2019 22:36:21 +0100 Subject: [PATCH 1/8] Update .travis.yml --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index def6960..207aa70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,20 @@ install: script: + - echo "building knx-linux" - cd examples/knx-linux - mkdir -p build - cd build - cmake .. - make + - cd ../../.. + - echo "building knxPython" + - cd examples/knxPython + - mkdir -p build + - cd build + - cmake .. + - make + - cd ../../.. # Test build for Arduino platform - language: cpp From 20d51586209aac6d6abead9377e6488488c6a838 Mon Sep 17 00:00:00 2001 From: thelsing Date: Wed, 18 Dec 2019 22:40:35 +0100 Subject: [PATCH 2/8] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 207aa70..d2bd8c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ - ubuntu-toolchain-r-test packages: - g++-7 + - python3.7 env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" cache: From 5f84c2512006c4e1150da4df9cef97b4b722c7a1 Mon Sep 17 00:00:00 2001 From: thelsing Date: Wed, 18 Dec 2019 22:46:08 +0100 Subject: [PATCH 3/8] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d2bd8c4..fac8786 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ - ubuntu-toolchain-r-test packages: - g++-7 - - python3.7 env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" cache: @@ -21,6 +20,9 @@ quiet: true before_install: + - sudo add-apt-repository -y ppa:deadsnakes/ppa + - sudo apt-get -q update + - sudo apt-get -y install python3.7 - eval "${MATRIX_EVAL}" install: From 721bd8c8317382f947f0e6ae8abf216058d07c9d Mon Sep 17 00:00:00 2001 From: thelsing Date: Wed, 18 Dec 2019 22:49:06 +0100 Subject: [PATCH 4/8] Update .travis.yml --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fac8786..b99574e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,10 @@ apt: sources: - ubuntu-toolchain-r-test + - deadsnakes/ppa packages: - g++-7 + - python3.7 env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" cache: @@ -20,9 +22,6 @@ quiet: true before_install: - - sudo add-apt-repository -y ppa:deadsnakes/ppa - - sudo apt-get -q update - - sudo apt-get -y install python3.7 - eval "${MATRIX_EVAL}" install: From 68ab5ed2e028b1928abcc554b9805bbf5fd4720a Mon Sep 17 00:00:00 2001 From: thelsing Date: Wed, 18 Dec 2019 22:51:32 +0100 Subject: [PATCH 5/8] Update CMakeLists.txt --- examples/knxPython/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/knxPython/CMakeLists.txt b/examples/knxPython/CMakeLists.txt index 33b304a..5cfa76d 100644 --- a/examples/knxPython/CMakeLists.txt +++ b/examples/knxPython/CMakeLists.txt @@ -2,7 +2,7 @@ #Note: VisualGDB will automatically update this file when you add new sources to the project. cmake_minimum_required(VERSION 2.7) -#project(knx) +project(knx) add_subdirectory(pybind11) From fdbe74b3c212275a76ffe1fba45a1ff477ff26b4 Mon Sep 17 00:00:00 2001 From: thelsing Date: Wed, 18 Dec 2019 22:53:59 +0100 Subject: [PATCH 6/8] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b99574e..f4e9539 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ apt: sources: - ubuntu-toolchain-r-test - - deadsnakes/ppa + - deadsnakes packages: - g++-7 - python3.7 From 337e5bd3a59f18e6b3d664a49ee8afa960885967 Mon Sep 17 00:00:00 2001 From: thelsing Date: Wed, 18 Dec 2019 22:58:45 +0100 Subject: [PATCH 7/8] Update CMakeLists.txt --- examples/knxPython/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/knxPython/CMakeLists.txt b/examples/knxPython/CMakeLists.txt index 5cfa76d..f40d0b4 100644 --- a/examples/knxPython/CMakeLists.txt +++ b/examples/knxPython/CMakeLists.txt @@ -41,6 +41,6 @@ pybind11_add_module(knx src/knx/dpt.cpp) include_directories(src pybind11/include) -set(outdir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) -set_target_properties(knx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${outdir}) +#set(outdir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) +#set_target_properties(knx PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${outdir}) set_target_properties(knx PROPERTIES OUTPUT_NAME knx) From f7de00c1dfae66fd56c5739f7a66a2cabfb6c01f Mon Sep 17 00:00:00 2001 From: thelsing Date: Wed, 18 Dec 2019 23:05:08 +0100 Subject: [PATCH 8/8] Update .travis.yml --- .travis.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4e9539..8452609 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,8 @@ apt: sources: - ubuntu-toolchain-r-test - - deadsnakes packages: - g++-7 - - python3.7 env: - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" cache: @@ -33,14 +31,6 @@ - cd build - cmake .. - make - - cd ../../.. - - echo "building knxPython" - - cd examples/knxPython - - mkdir -p build - - cd build - - cmake .. - - make - - cd ../../.. # Test build for Arduino platform - language: cpp