Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
49 changes: 49 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
18 changes: 9 additions & 9 deletions qtapp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)

Expand Down