diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2022-03-09 21:42:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 21:42:44 +0100 |
| commit | 10aa25d5ada958dbdc6caf31c17c7b24fe2db253 (patch) | |
| tree | 31fc4aa3e0d6564a5050c8afec46add51afaa2dd | |
| parent | b68b8cd1b829be8d69d6b481f8bb19595294a46a (diff) | |
| parent | e082c6f1ef95708346b254ac8bcce9631f79ca43 (diff) | |
| download | PROJ-10aa25d5ada958dbdc6caf31c17c7b24fe2db253.tar.gz PROJ-10aa25d5ada958dbdc6caf31c17c7b24fe2db253.zip | |
Merge pull request #3107 from OSGeo/backport-3106-to-9.0
[Backport 9.0] nkg.gie: update results due to https://github.com/OSGeo/PROJ-data/pull/79
| -rw-r--r-- | .github/workflows/windows.yml | 3 | ||||
| -rw-r--r-- | cmake/ProjTest.cmake | 1 | ||||
| -rw-r--r-- | test/gie/nkg.gie | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 10c83759..9600875c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -45,7 +45,8 @@ jobs: run: | set VCPKG_INSTALLED=c:\vcpkg\installed\${{ env.ARCH }}-windows dir %VCPKG_INSTALLED%\bin - set PATH=%VCPKG_INSTALLED%\bin;%PATH% + dir %VCPKG_INSTALLED%\tools + set PATH=%VCPKG_INSTALLED%\bin;%VCPKG_INSTALLED%\tools;%PATH% set PROJ_BUILD=%GITHUB_WORKSPACE%\build mkdir %PROJ_BUILD% cd %PROJ_BUILD% diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake index c632d539..9801fda1 100644 --- a/cmake/ProjTest.cmake +++ b/cmake/ProjTest.cmake @@ -39,6 +39,7 @@ endfunction() # Create user writable directory for tests add_custom_target(create_tmp_user_writable_dir ALL + COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJ_BINARY_DIR}/tmp_user_writable_dir COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJ_BINARY_DIR}/tmp_user_writable_dir) function(proj_add_gie_network_dependent_test TESTNAME TESTCASE) diff --git a/test/gie/nkg.gie b/test/gie/nkg.gie index 5ea476cf..678b4680 100644 --- a/test/gie/nkg.gie +++ b/test/gie/nkg.gie @@ -208,15 +208,15 @@ tolerance 0.1 mm # STAS accept 3275753.4135 321111.2481 5445042.2134 2020.0 -expect 3275753.9111 321110.8658 5445041.8822 2020.0 +expect 3275753.9094 321110.8626 5445041.8818 2020.0 # BOD3 accept 2391773.9918 615615.1837 5860966.1279 2020.0 -expect 2391774.5535 615614.9100 5860965.8138 2020.0 +expect 2391774.5481 615614.9063 5860965.8185 2020.0 # KAUS accept 2107888.9134 895603.4769 5933242.6269 2020.0 -expect 2107889.5097 895603.2085 5933242.3152 2020.0 +expect 2107889.5014 895603.2055 5933242.3208 2020.0 # ------------------------------------------------------------------------------- |