Skip to content
Snippets Groups Projects
Commit 40d03d04 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Merge branch 'master' into pcl

parents ec56284b cfef444a
No related branches found
No related tags found
No related merge requests found
image: ubuntu:18.04 windows job:
tags:
before_script: - win
- export DEBIAN_FRONTEND=noninteractive script:
- apt-get update -qq && apt-get install -y -qq g++ cmake git - 'call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars64.bat"'
- apt-get install -y -qq libopencv-dev libgoogle-glog-dev liburiparser-dev libreadline-dev libmsgpack-dev uuid-dev - mkdir build
- cd build
- 'cmake -DCMAKE_GENERATOR_PLATFORM=x64 -DOpenCV_DIR="D:/opencv-4.0.1/build/install" -DCUDA_TOOLKIT_ROOT_DIR="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.1" ..'
- devenv ftl.utu.fi.sln /build Release
linux job:
tags:
- docker
ftl: image: ubuntu:18.04
before_script:
- export DEBIAN_FRONTEND=noninteractive
- apt-get update -qq && apt-get install -y -qq g++ cmake git
- apt-get install -y -qq libopencv-dev libgoogle-glog-dev liburiparser-dev libreadline-dev libmsgpack-dev uuid-dev
script: script:
- mkdir build - mkdir build
- cd build - cd build
- cmake .. - cmake ..
- make - make
- make test - make test
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment