Skip to content
This repository was archived by the owner on Jul 20, 2023. It is now read-only.

Commit 3765d3d

Browse files
committed
Use a dedicated directory for deployment
Avoid to mess with root dir of projects and overwriting of files such as packagedependencies.txt. (cherry picked from commit 4645ce5)
1 parent 47d3e45 commit 3765d3d

File tree

36 files changed

+48
-47
lines changed

36 files changed

+48
-47
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.o
88
*.obj
99
*build*
10+
deploy
1011

1112
# Precompiled Headers
1213
*.gch

tests/SolARTest_ModuleOpenCV_CameraCalibration/SolARTest_ModuleOpenCV_CameraCalibration.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ QMAKE_PROJECT_DEPTH = 0
77
## global defintions : target lib name, version
88
TARGET = SolARTest_ModuleOpenCV_CameraCalibration
99
VERSION=0.11.0
10-
PROJECTDEPLOYDIR = $${PWD}/..
10+
PROJECTDEPLOYDIR = $${PWD}/../deploy
1111

1212
DEFINES += MYVERSION=$${VERSION}
1313
CONFIG += c++1z

tests/SolARTest_ModuleOpenCV_DescriptorMatcher/SolARTest_ModuleOpenCV_DescriptorMatcher.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ QMAKE_PROJECT_DEPTH = 0
77
## global defintions : target lib name, version
88
TARGET = SolARTest_ModuleOpenCV_DescriptorMatcher
99
VERSION=0.11.0
10-
PROJECTDEPLOYDIR = $${PWD}/..
10+
PROJECTDEPLOYDIR = $${PWD}/../deploy
1111

1212
DEFINES += MYVERSION=$${VERSION}
1313
CONFIG += c++1z

tests/SolARTest_ModuleOpenCV_DescriptorMatcher/SolARTest_ModuleOpenCV_DescriptorMatcher_conf.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959

6060
<properties>
6161
<configure component="SolARImageLoaderOpencv" name="image1">
62-
<property name="filePath" type="string" value="../../../../data/notredame1.jpg"/>
62+
<property name="filePath" type="string" value="../../../../../data/notredame1.jpg"/>
6363
</configure>
6464
<configure component="SolARImageLoaderOpencv" name="image2">
65-
<property name="filePath" type="string" value="../../../../data/notredame2.jpg"/>
65+
<property name="filePath" type="string" value="../../../../../data/notredame2.jpg"/>
6666
</configure>
6767
<configure component="SolARKeypointDetectorOpencv" name="AKAZEDescProperties">
6868
<property name="type" type="string" value="AKAZE2"/>

tests/SolARTest_ModuleOpenCV_DeviceDataLoader/SolARTest_ModuleOpenCV_DeviceDataLoader.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ QMAKE_PROJECT_DEPTH = 0
77
## global defintions : target lib name, version
88
TARGET = SolARTest_ModuleOpenCV_DeviceDataLoader
99
VERSION=0.11.0
10-
PROJECTDEPLOYDIR = $${PWD}/..
10+
PROJECTDEPLOYDIR = $${PWD}/../deploy
1111

1212
DEFINES += MYVERSION=$${VERSION}
1313
CONFIG += c++1z

tests/SolARTest_ModuleOpenCV_DeviceDataLoader/SolARTest_ModuleOpenCV_DeviceDataLoader_conf.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424

2525
<properties>
2626
<configure component="SolARDeviceDataLoader">
27-
<property name="calibrationFile" type="string" value="../../../../data/hololens_calibration.json"/>
28-
<property name="pathToData" type="string" value="../../../../data/loop_desktop_A"/>
27+
<property name="calibrationFile" type="string" value="../../../../../data/hololens_calibration.json"/>
28+
<property name="pathToData" type="string" value="../../../../../data/loop_desktop_A"/>
2929
<property name="delayTime" type="int" value="100"/>
3030
</configure>
3131
<configure component="SolARImageViewerOpencv">

tests/SolARTest_ModuleOpenCV_DeviceDualMarkerCalibration/SolARTest_ModuleOpenCV_DeviceDualMarkerCalibration.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ QMAKE_PROJECT_DEPTH = 0
77
## global defintions : target lib name, version
88
TARGET = SolARTest_ModuleOpenCV_DeviceDualMarkerCalibration
99
VERSION=0.11.0
10-
PROJECTDEPLOYDIR = $${PWD}/..
10+
PROJECTDEPLOYDIR = $${PWD}/../deploy
1111

1212
DEFINES += MYVERSION=$${VERSION}
1313
CONFIG += c++1z

tests/SolARTest_ModuleOpenCV_DeviceDualMarkerCalibration/SolARTest_ModuleOpenCV_DeviceDualMarkerCalibration_conf.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696

9797
<properties>
9898
<configure component="SolARDeviceDataLoader">
99-
<property name="calibrationFile" type="string" value="../../../../data/hololens_calibration.json"/>
100-
<property name="pathToData" type="string" value="../../../../data/loop_desktop_A"/>
99+
<property name="calibrationFile" type="string" value="../../../../../data/hololens_calibration.json"/>
100+
<property name="pathToData" type="string" value="../../../../../data/loop_desktop_A"/>
101101
<property name="delayTime" type="int" value="100"/>
102102
</configure>
103103
<configure component="SolARImageViewerOpencv">
@@ -169,10 +169,10 @@
169169
<property name="maxThreshold" type="int" value="220"/>
170170
</configure>
171171
<configure component="SolARFiducialMarkerLoaderOpencv" name="marker1">
172-
<property name="filePath" type="string" value="../../../../data/fiducialMarkerA.yml" description="Path of the .yml file describing the fiducial marker."/>
172+
<property name="filePath" type="string" value="../../../../../data/fiducialMarkerA.yml" description="Path of the .yml file describing the fiducial marker."/>
173173
</configure>
174174
<configure component="SolARFiducialMarkerLoaderOpencv" name="marker2">
175-
<property name="filePath" type="string" value="../../../../data/fiducialMarkerB.yml" description="Path of the .yml file describing the fiducial marker."/>
175+
<property name="filePath" type="string" value="../../../../../data/fiducialMarkerB.yml" description="Path of the .yml file describing the fiducial marker."/>
176176
</configure>
177177
<configure component="SolARImageFilterBinaryOpencv">
178178
<property name="min" type="int" value="-1" description="minimum threshold (-1 to automatically compute it on the global image"/>

tests/SolARTest_ModuleOpenCV_DevicePoseCorrection/SolARTest_ModuleOpenCV_DevicePoseCorrection.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ QMAKE_PROJECT_DEPTH = 0
77
## global defintions : target lib name, version
88
TARGET = SolARTest_ModuleOpenCV_DevicePoseCorrection
99
VERSION=0.11.0
10-
PROJECTDEPLOYDIR = $${PWD}/..
10+
PROJECTDEPLOYDIR = $${PWD}/../deploy
1111

1212
DEFINES += MYVERSION=$${VERSION}
1313
CONFIG += c++1z

tests/SolARTest_ModuleOpenCV_DevicePoseCorrection/SolARTest_ModuleOpenCV_DevicePoseCorrection_conf.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898

9999
<properties>
100100
<configure component="SolARDeviceDataLoader">
101-
<property name="calibrationFile" type="string" value="../../../../data/hololens_calibration.json"/>
102-
<property name="pathToData" type="string" value="../../../../data/loop_desktop_A"/>
101+
<property name="calibrationFile" type="string" value="../../../../../data/hololens_calibration.json"/>
102+
<property name="pathToData" type="string" value="../../../../../data/loop_desktop_A"/>
103103
<property name="delayTime" type="int" value="100"/>
104104
</configure>
105105
<configure component="SolARImageViewerOpencv">
@@ -171,7 +171,7 @@
171171
<property name="maxThreshold" type="int" value="220"/>
172172
</configure>
173173
<configure component="SolARFiducialMarkerLoaderOpencv">
174-
<property name="filePath" type="string" value="../../../../data/fiducialMarkerA.yml" description="Path of the .yml file describing the fiducial marker."/>
174+
<property name="filePath" type="string" value="../../../../../data/fiducialMarkerA.yml" description="Path of the .yml file describing the fiducial marker."/>
175175
</configure>
176176
<configure component="SolARImageFilterBinaryOpencv">
177177
<property name="min" type="int" value="-1" description="minimum threshold (-1 to automatically compute it on the global image"/>

0 commit comments

Comments
 (0)