jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update version CI config and README

Browse Source
This commit is contained in:
jfmcarreira
2021-09-25 17:02:03 +01:00
parent 48afd0be45
commit 9ea9d845c7
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yaml
+4 -9
View File
@@ -1,9 +1,9 @@
name: Build and Test name: Build
on: on:
push: push:
branches: branches:
- devel - master
jobs: jobs:
@@ -17,15 +17,10 @@ jobs:
uses: ashutoshvarma/action-cmake-build@v1 uses: ashutoshvarma/action-cmake-build@v1
with: with:
build-dir: ${{ runner.workspace }}/build build-dir: ${{ runner.workspace }}/build
# will set the CC & CXX for cmake
cc: gcc
cxx: g++
build-type: Release build-type: Release
# Extra options pass to cmake while configuring project # Extra options pass to cmake while configuring project
configure-options: -DBUILD_TESTS=ON -DUSE_WERROR=ON configure-options: -DUSE_WERROR=OFF
run-test: true
#ctest-options: -R mytest
# install the build using cmake --install # install the build using cmake --install
install-build: true install-build: true
# run build using '-j [parallel]' to use multiple threads to build # run build using '-j [parallel]' to use multiple threads to build
parallel: 14 parallel: 8
.travis.yml
+1 -1
View File
@@ -1,5 +1,5 @@
language: cpp language: cpp
dist: xenial dist: bionic
before_install: before_install:
- sudo apt-get -qq update - sudo apt-get -qq update
- sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev libgtest-dev - sudo apt-get install build-essential cmake qtbase5-dev libavcodec-dev libavformat-dev libavutil-dev libopencv-dev libopencv-video-dev libopencv-contrib-dev libgtest-dev
README.md
+3 -3
View File
@@ -20,7 +20,7 @@ Master branch | Development branch
- Constant growing libs for stream and frame processing (CalypStream and CalypFrame) - Constant growing libs for stream and frame processing (CalypStream and CalypFrame)
- Advanced API for frame/video processing algorithms - Advanced API for frame/video processing algorithms
- Frame level quality measurement API based on the CalypFrame class - Frame level quality measurement API based on the CalypFrame class
- Powefull command-line tool for quality and frame processing algorithms (uses the referred APIs) - Powerful command-line tool for quality and frame processing algorithms (uses the referred APIs)
## Modules ## Modules
- CalypLib: Low level library - CalypLib: Low level library
@@ -73,13 +73,13 @@ Master branch | Development branch
* **Dependencies** * **Dependencies**
1. an ordinary C++ development environment (g++, make, C++ libraries and headers, ...) 1. an ordinary C++ development environment (g++, make, C++ libraries and headers, ...)
2. cmake 2. cmake
3. a Qt development environment: QtCore, QtGui, QtWidgets, QtPrintSupport and QtConcurrent (version 4 or higher) 3. a Qt development environment: QtCore, QtGui, QtWidgets, QtPrintSupport and QtConcurrent (version 5 or higher)
4. Optional: QtDBus, OpenCV, FFmpeg 4. Optional: QtDBus, OpenCV, FFmpeg
* **List of required commands** * **List of required commands**
``` ```
mkdir build mkdir build
cd build cd build
cmake -DUSE_QT4=OFF -DUSE_FFMPEG=ON -DUSE_OPENCV=ON .. (for FFmpeg and OpenCV support) cmake -DUSE_FFMPEG=ON -DUSE_OPENCV=ON .. (for FFmpeg and OpenCV support)
make make
make install make install
``` ```