Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2017-08-26 04:26:33 +01:00
commit 1242b463b9
2 files changed
+7 -1

No files matched your search

+6
View File
@@ -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 ..
+1 -1
View File
@@ -2,7 +2,7 @@
### CMakeLists for playuver ### CMakeLists for playuver
### ###
cmake_minimum_required( VERSION 3.5.0 ) cmake_minimum_required( VERSION 3.2.0 )
###################################################################################### ######################################################################################
# CMake functions # CMake functions