fix test

PeterPetrik · PeterPetrik · commit c59da3495cce · 2021-04-07T13:09:07.000+02:00
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -49,7 +49,7 @@ jobs:
           if(-Not (Test-Path -Path build-geodiff)) { mkdir build-geodiff }
           cd build-geodiff
 
-          cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTS=FALSE ..\geodiff\geodiff
+          cmake -DBUILD_STATIC=TRUE -DENABLE_TESTS=FALSE ..\geodiff\geodiff
           cmake --build . --config Release
 
       - name: build mergin-cpp-client
@@ -59,5 +59,6 @@ jobs:
           if(-Not (Test-Path -Path build-mergin-cpp-client)) { mkdir build-mergin-cpp-client }
           cd build-mergin-cpp-client
 
-          qmake ..\mergin-cpp-client\src\client.pro CONFIG+=release
-          nmake
+          qmake ..\mergin-cpp-client\src\client.pro CONFIG+=release CONFIG+=static
+          nmake release
+          dir
diff --git a/scripts/ci/config.pri b/scripts/ci/config.pri
@@ -1,6 +1,6 @@
 win32 {
   INPUT_DIR = $$PWD/../../input
-  GEODIFF_INCLUDE_DIR = $$PWD/../geodiff/geodiff
+  GEODIFF_INCLUDE_DIR = $$PWD/../geodiff/geodiff/src
   GEODIFF_LIB_DIR = $$PWD/../build-geodiff
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`win32 {`
`2`	`2`	`INPUT_DIR = $$PWD/../../input`
`3`		`- GEODIFF_INCLUDE_DIR = $$PWD/../geodiff/geodiff`
	`3`	`+ GEODIFF_INCLUDE_DIR = $$PWD/../geodiff/geodiff/src`
`4`	`4`	`GEODIFF_LIB_DIR = $$PWD/../build-geodiff`
`5`	`5`	`}`
`6`	`6`