Merge branch 'master' into devel

2017-08-26 04:26:33 +01:00
parent a037ec4389 633996c34d
commit 1242b463b9
2 changed files with 7 additions and 1 deletions
@@ -0,0 +1,6 @@
+language: cpp
+dist: xenial
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libopencv-dev
+script: mkdir -p build && cd build && cmake .. && make && cd ..
@@ -2,7 +2,7 @@
 ### CMakeLists for playuver
 ###

-cmake_minimum_required( VERSION 3.5.0 )
+cmake_minimum_required( VERSION 3.2.0 )

 ######################################################################################
 # CMake  functions