From d928db15d53805d9b728b440079756081961c536 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 14 Nov 2018 17:40:42 +0100 Subject: Implement RFC 2: Initial integration of "GDAL SRS barn" work This work mostly consists of: - a C++ implementation of the ISO-19111:2018 / OGC Topic 2 "Referencing by coordinates" classes to represent Datums, Coordinate systems, CRSs (Coordinate Reference Systems) and Coordinate Operations. - methods to convert between this C++ modeling and WKT1, WKT2 and PROJ string representations of those objects - management and query of a SQLite3 database of CRS and Coordinate Operation definition - a C API binding part of those capabilities This is all-in-one squashed commit of the work of https://github.com/OSGeo/proj.4/pull/1040 --- appveyor.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'appveyor.yml') diff --git a/appveyor.yml b/appveyor.yml index 11059e92..2a1aa976 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,19 +17,28 @@ shallow_clone: true build_script: - echo build_script + - vcpkg install sqlite3:"%platform%"-windows + - ps: | + appveyor DownloadFile https://sqlite.org/2018/sqlite-tools-win32-x86-3250100.zip + 7z x sqlite-tools-win32-x86-3250100.zip + copy sqlite-tools-win32-x86-3250100/sqlite3.exe . - if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 - if "%platform%" == "x86" SET VS_FULL=%VS_VERSION% - echo "%VS_FULL%" # - if "%platform%" == "x64" mkdir build_dll - if "%platform%" == "x64" cd build_dll - - if "%platform%" == "x64" cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=ON -DCMAKE_C_FLAGS="/WX" + - if "%platform%" == "x64" copy ..\sqlite3.exe . + - if "%platform%" == "x64" copy c:\tools\vcpkg\installed\x64-windows\bin\sqlite3.dll . + - if "%platform%" == "x64" cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=ON -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake - if "%platform%" == "x64" cmake --build . --config Release - if "%platform%" == "x64" cd .. # - if "%platform%" == "x86" mkdir build_static - if "%platform%" == "x86" cd build_static - - if "%platform%" == "x86" cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=OFF -DCMAKE_C_FLAGS="/WX" + - if "%platform%" == "x86" copy ..\sqlite3.exe . + - if "%platform%" == "x86" copy c:\tools\vcpkg\installed\x86-windows\bin\sqlite3.dll . + - if "%platform%" == "x86" cmake -G "%VS_FULL%" .. -DCMAKE_BUILD_TYPE=Release -DBUILD_LIBPROJ_SHARED=OFF -DCMAKE_C_FLAGS="/WX" -DCMAKE_CXX_FLAGS="/WX" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake - if "%platform%" == "x86" cmake --build . --config Release - if "%platform%" == "x86" cd .. @@ -45,11 +54,11 @@ test_script: - cd %CURDIR% # - if "%platform%" == "x64" cd build_dll - - if "%platform%" == "x64" ctest -C Release + - if "%platform%" == "x64" ctest -V -C Release - if "%platform%" == "x64" cd .. # - if "%platform%" == "x86" cd build_static - - if "%platform%" == "x86" ctest -C Release + - if "%platform%" == "x86" ctest -V -C Release - if "%platform%" == "x86" cd .. deploy: off -- cgit v1.2.3