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

Attempt to reuse build dir

parent da7427be
No related branches found
No related tags found
No related merge requests found
Pipeline #29187 failed
...@@ -18,9 +18,6 @@ linux: ...@@ -18,9 +18,6 @@ linux:
stage: all stage: all
tags: tags:
- linux - linux
cache:
paths:
- ext/
variables: variables:
FTL_LIB: ../../build/SDK/C/libftl-dev.so FTL_LIB: ../../build/SDK/C/libftl-dev.so
LD_LIBRARY_PATH: /opt/pylon/lib/ LD_LIBRARY_PATH: /opt/pylon/lib/
...@@ -58,8 +55,8 @@ webserver-deploy: ...@@ -58,8 +55,8 @@ webserver-deploy:
.build-windows: &build-windows .build-windows: &build-windows
- 'call vcvars64.bat' - 'call vcvars64.bat'
- mkdir build - if not exist ../ftl_build mkdir ../ftl_build
- cd build - cd ../ftl_build
- cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DOPENVR_DIR="C:/Program Files (x86)/OpenVRSDK" -DOPUS_DIR="C:/Program Files (x86)/Opus" .. - cmake %CMAKE_ARGS% %CMAKE_ARGS_WINDOWS% -DREALSENSE_DIR="C:/Program Files (x86)/Intel RealSense SDK 2.0" -DOPENVR_DIR="C:/Program Files (x86)/OpenVRSDK" -DOPUS_DIR="C:/Program Files (x86)/Opus" ..
- devenv ftl.utu.fi.sln /build Release - devenv ftl.utu.fi.sln /build Release
- rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%" - rmdir /q /s "%DEPLOY_DIR%/%CI_COMMIT_REF_SLUG%"
...@@ -71,9 +68,6 @@ windows-vision: ...@@ -71,9 +68,6 @@ windows-vision:
except: except:
- master - master
stage: all stage: all
cache:
paths:
- ext/
variables: variables:
CMAKE_ARGS: '-DENABLE_PROFILER=TRUE -DWITH_OPTFLOW=TRUE -DBUILD_VISION=TRUE -DBUILD_CALIBRATION=FALSE -DBUILDRECONSTRUCT=FALSE -DBUILDRENDERER=FALSE -DBUILD_TESTING=FALSE -DBUILD_TESTS=FALSE' CMAKE_ARGS: '-DENABLE_PROFILER=TRUE -DWITH_OPTFLOW=TRUE -DBUILD_VISION=TRUE -DBUILD_CALIBRATION=FALSE -DBUILDRECONSTRUCT=FALSE -DBUILDRENDERER=FALSE -DBUILD_TESTING=FALSE -DBUILD_TESTS=FALSE'
DEPLOY_DIR: 'C:/Shared/AutoDeploy' DEPLOY_DIR: 'C:/Shared/AutoDeploy'
...@@ -86,9 +80,6 @@ windows-master: ...@@ -86,9 +80,6 @@ windows-master:
only: only:
- master - master
stage: all stage: all
cache:
paths:
- ext/
variables: variables:
CMAKE_ARGS: '-DWITH_OPTFLOW=TRUE' CMAKE_ARGS: '-DWITH_OPTFLOW=TRUE'
DEPLOY_DIR: 'C:/Shared/AutoDeploy' DEPLOY_DIR: 'C:/Shared/AutoDeploy'
......
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