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 new file mode 100644 index 0000000..b310d50 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,49 @@ +dist: precise +language: cpp +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-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 cmake cmake-data +script: + - cd qtapp + - mkdir build + - cd build + - cmake -DCMAKE_CXX_COMPILER=$COMPILER .. && make 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)