Merge branch 'master' into devel
This commit is contained in:
2 files changed
+7
-1
No files matched your search
@@ -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
@@ -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
|
||||||
|
|||||||
Reference in new issue
Block a user