From cec0bf9556c805c3b9f07a71a0510977ab1eff98 Mon Sep 17 00:00:00 2001 From: William Jagels Date: Sun, 27 Nov 2016 02:58:39 +0200 Subject: [PATCH 1/6] Initial travis commit --- .travis.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..c5dace4 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,50 @@ +dist: precise +language: cpp +addons: + - ppa:canonical-qt5-edgers/ubuntu1204-qt5 + +matrix: + include: + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.9 + env: COMPILER=g++-4.9 + - compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-5 + env: COMPILER=g++-5 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.6 + packages: + - clang-3.6 + env: COMPILER=clang++-3.6 + - compiler: clang + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - clang-3.7 + env: COMPILER=clang++-3.7 + +before_install: + - sudo apt-get update -qq + - sudo apt-get install -y libopencv-dev qtdeclarative5-dev +script: + - cd qtapp + - mkdir build + - cd build + - cmake -DCMAKE_CXX_COMPILER=$COMPILER .. && make From 3fda24c34c26465dd0fce71cda134713fa890f6f Mon Sep 17 00:00:00 2001 From: William Jagels Date: Sun, 27 Nov 2016 03:15:21 +0200 Subject: [PATCH 2/6] Fix sources and submodule --- .gitmodules | 2 +- .travis.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 13bb2b6..7bb4e4b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "qtapp/third_party/cpr"] path = qtapp/third_party/cpr - url = git@github.com:whoshuu/cpr.git + url = https://github.com/whoshuu/cpr.git diff --git a/.travis.yml b/.travis.yml index c5dace4..5bf9579 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ dist: precise language: cpp addons: - - ppa:canonical-qt5-edgers/ubuntu1204-qt5 + apt: + sources: + - ppa:canonical-qt5-edgers/ubuntu1204-qt5 matrix: include: From 658388c12dc52d21433d877e151ad615c923f1a2 Mon Sep 17 00:00:00 2001 From: William Jagels Date: Sun, 27 Nov 2016 03:19:06 +0200 Subject: [PATCH 3/6] Fix travis config --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bf9579..740ec5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,5 @@ dist: precise language: cpp -addons: - apt: - sources: - - ppa:canonical-qt5-edgers/ubuntu1204-qt5 - matrix: include: - compiler: gcc @@ -12,6 +7,7 @@ matrix: apt: sources: - ubuntu-toolchain-r-test + - canonical-qt5-edgers/ubuntu1204-qt5 packages: - g++-4.9 env: COMPILER=g++-4.9 @@ -20,6 +16,7 @@ matrix: apt: sources: - ubuntu-toolchain-r-test + - canonical-qt5-edgers/ubuntu1204-qt5 packages: - g++-5 env: COMPILER=g++-5 @@ -29,6 +26,7 @@ matrix: sources: - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.6 + - canonical-qt5-edgers/ubuntu1204-qt5 packages: - clang-3.6 env: COMPILER=clang++-3.6 @@ -38,6 +36,7 @@ matrix: sources: - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.7 + - canonical-qt5-edgers/ubuntu1204-qt5 packages: - clang-3.7 env: COMPILER=clang++-3.7 From 453aae4f80f209bae5333f05d26fd088be89ac5c Mon Sep 17 00:00:00 2001 From: William Jagels Date: Sun, 27 Nov 2016 03:23:16 +0200 Subject: [PATCH 4/6] Subvert disallowed --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 740ec5b..1349db5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - canonical-qt5-edgers/ubuntu1204-qt5 packages: - g++-4.9 env: COMPILER=g++-4.9 @@ -16,7 +15,6 @@ matrix: apt: sources: - ubuntu-toolchain-r-test - - canonical-qt5-edgers/ubuntu1204-qt5 packages: - g++-5 env: COMPILER=g++-5 @@ -26,7 +24,6 @@ matrix: sources: - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.6 - - canonical-qt5-edgers/ubuntu1204-qt5 packages: - clang-3.6 env: COMPILER=clang++-3.6 @@ -36,12 +33,12 @@ matrix: sources: - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.7 - - canonical-qt5-edgers/ubuntu1204-qt5 packages: - clang-3.7 env: COMPILER=clang++-3.7 before_install: + - sudo apt-add-repository ppa:canonical-qt5-edgers/ubuntu1204-qt5 - sudo apt-get update -qq - sudo apt-get install -y libopencv-dev qtdeclarative5-dev script: From fc91b57c9be48902a3ce2ca8717ac4e5a3d794fd Mon Sep 17 00:00:00 2001 From: William Jagels Date: Sun, 27 Nov 2016 03:26:11 +0200 Subject: [PATCH 5/6] Hotfix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1349db5..6d2ab9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ matrix: env: COMPILER=clang++-3.7 before_install: - - sudo apt-add-repository ppa:canonical-qt5-edgers/ubuntu1204-qt5 + - sudo apt-add-repository -y ppa:canonical-qt5-edgers/ubuntu1204-qt5 - sudo apt-get update -qq - sudo apt-get install -y libopencv-dev qtdeclarative5-dev script: From 51756278bf7b28ac751eadd759720bbb078d42db Mon Sep 17 00:00:00 2001 From: William Jagels Date: Sun, 27 Nov 2016 03:31:48 +0200 Subject: [PATCH 6/6] Newer version of cmake --- .travis.yml | 3 ++- qtapp/CMakeLists.txt | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d2ab9b..b310d50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,9 @@ matrix: before_install: - sudo apt-add-repository -y ppa:canonical-qt5-edgers/ubuntu1204-qt5 + - sudo add-apt-repository -y ppa:george-edison55/precise-backports - sudo apt-get update -qq - - sudo apt-get install -y libopencv-dev qtdeclarative5-dev + - sudo apt-get install -y libopencv-dev qtdeclarative5-dev cmake cmake-data script: - cd qtapp - mkdir build diff --git a/qtapp/CMakeLists.txt b/qtapp/CMakeLists.txt index c52dacc..3e40a07 100644 --- a/qtapp/CMakeLists.txt +++ b/qtapp/CMakeLists.txt @@ -30,15 +30,6 @@ else() endif() endif() - -# Instruct CMake to run moc automatically when needed. -set(CMAKE_AUTOMOC ON) - -set(CMAKE_AUTOUIC ON) - -# Find includes in corresponding build directories -set(CMAKE_INCLUDE_CURRENT_DIR ON) - if($ENV{USER} STREQUAL "nik") set(OpenCV_DIR ~/opencv/build) endif() @@ -49,6 +40,15 @@ find_package(Qt5Widgets REQUIRED) find_package(OpenCV REQUIRED) find_package(CURL) + +# Instruct CMake to run moc automatically when needed. +set(CMAKE_AUTOMOC ON) + +set(CMAKE_AUTOUIC ON) + +# Find includes in corresponding build directories +set(CMAKE_INCLUDE_CURRENT_DIR ON) + add_executable(qtapp main.cpp mainwindow.cpp expandpath.cpp) target_link_libraries(qtapp Qt5::Widgets)