Skip to content
This repository was archived by the owner on Nov 17, 2025. It is now read-only.

Commit 68d50df

Browse files
PeterPetrikPeterPetrik
committed
fix test
1 parent 89f3698 commit 68d50df

File tree

3 files changed

+73
-8
lines changed

3 files changed

+73
-8
lines changed

‎.github/workflows/windows.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Windows Build
2+
on: [push]
3+
4+
jobs:
5+
windows_build:
6+
if: ( github.repository == 'lutraconsulting/mergin-cpp-client' )
7+
runs-on: windows-latest
8+
env:
9+
VS_VERSION: Visual Studio 16
10+
VS_VER: 2019
11+
SDK: release-1911
12+
MSVC_VER: 1920
13+
platform: x86
14+
15+
steps:
16+
- name: Checkout mergin-cpp-client
17+
uses: actions/checkout@v2
18+
with:
19+
path: mergin-cpp-client
20+
21+
- name: Checkout input
22+
uses: actions/checkout@v2
23+
with:
24+
repository: lutraconsulting/input
25+
ref: mergin_cpp
26+
path: input
27+
28+
- name: Checkout geodiff
29+
uses: actions/checkout@v2
30+
with:
31+
ref: 0.8.6
32+
repository: lutraconsulting/geodiff
33+
path: geodiff
34+
35+
- name: Install Qt
36+
uses: jurplel/install-qt-action@v2
37+
38+
- name: Set compiler environment
39+
shell: cmd
40+
run: |
41+
CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x86
42+
43+
- name: Install Deps
44+
run: |
45+
sudo apt-get install cmake qt5-default libqt5network5
46+
47+
- name: build geodiff
48+
shell: pwsh
49+
run: |
50+
if(-Not (Test-Path -Path build-geodiff)) { mkdir build-geodiff }
51+
cd build-geodiff
52+
53+
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTS=FALSE ..\geodiff\geodiff
54+
cmake --build . --config Release
55+
56+
- name: build mergin-cpp-client
57+
shell: pwsh
58+
run: |
59+
Copy-Item mergin-cpp-client\scripts\ci\config.pri mergin-cpp-client\src\config.pri
60+
if(-Not (Test-Path -Path build-geodiff)) { mkdir build-mergin-cpp-client }
61+
cd build-mergin-cpp-client
62+
63+
qmake ..\mergin-cpp-client\src\client.pro CONFIG+=release
64+
nmake
65+

‎scripts/ci/config.pri‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
win32 {
22
INPUT_DIR=$$PWD/../input/
3-
GEODIFF_INCLUDE_DIR = /usr/include
4-
GEODIFF_LIB_DIR = /usr/lib
3+
GEODIFF_INCLUDE_DIR = $$PWD/../geodiff/geodiff
4+
GEODIFF_LIB_DIR = $$PWD/../build-geodiff
55
}
66

77
lnx {
@@ -12,6 +12,6 @@ lnx {
1212

1313
mac {
1414
INPUT_DIR=$$PWD/../input/
15-
GEODIFF_INCLUDE_DIR = /usr/include
16-
GEODIFF_LIB_DIR = /usr/lib
15+
GEODIFF_INCLUDE_DIR = /usr/local/include
16+
GEODIFF_LIB_DIR = /usr/local/lib
1717
}

‎src/config.pri.default‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
win32 {
22
INPUT_DIR=$$PWD/../input/
3-
GEODIFF_INCLUDE_DIR = /usr/include
4-
GEODIFF_LIB_DIR = /usr/lib
3+
GEODIFF_INCLUDE_DIR = $$PWD/../geodiff/geodiff
4+
GEODIFF_LIB_DIR = $$PWD/../build-geodiff
55
}
66

77
lnx {
@@ -12,6 +12,6 @@ lnx {
1212

1313
mac {
1414
INPUT_DIR=$$PWD/../input/
15-
GEODIFF_INCLUDE_DIR = /usr/include
16-
GEODIFF_LIB_DIR = /usr/lib
15+
GEODIFF_INCLUDE_DIR = /usr/local/include
16+
GEODIFF_LIB_DIR = /usr/local/lib
1717
}

0 commit comments

Comments
 (0)