sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/mapnik/mapnik into feature/cmake-static

Browse source
This commit is contained in:
Mathis Logemann 2022-11-26 08:32:20 +01:00
commit df1ff425b7
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/macos.yml vendored
View file

@ -104,7 +104,7 @@ jobs:
continue-on-error: true continue-on-error: true
working-directory: build/${{ env.preset }}/out working-directory: build/${{ env.preset }}/out
env: env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj
run: ./mapnik-test-visual -j $(sysctl -n hw.logicalcpu) --output-dir ./visual-test-result run: ./mapnik-test-visual -j $(sysctl -n hw.logicalcpu) --output-dir ./visual-test-result
- name: Pack visual test results - name: Pack visual test results
@ -114,7 +114,7 @@ jobs:
- name: Run Benchmark - name: Run Benchmark
working-directory: build/${{ env.preset }}/out working-directory: build/${{ env.preset }}/out
env: env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj/data PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-osx/share/proj
run: ./run_benchmarks run: ./run_benchmarks
- name: Coverage - name: Coverage

6
.github/workflows/ubuntu.yml vendored
View file

@ -31,7 +31,7 @@ env:
jobs: jobs:
build: build:
runs-on: ubuntu-22.04 runs-on: ubuntu-latest
services: services:
postgres: postgres:
@ -120,7 +120,7 @@ jobs:
continue-on-error: true continue-on-error: true
working-directory: build/${{ env.preset }}/out working-directory: build/${{ env.preset }}/out
env: env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj
run: ./mapnik-test-visual -j $(nproc) --output-dir ./visual-test-result run: ./mapnik-test-visual -j $(nproc) --output-dir ./visual-test-result
- name: Pack visual test results - name: Pack visual test results
@ -130,7 +130,7 @@ jobs:
- name: Run Benchmarks - name: Run Benchmarks
working-directory: build/${{ env.preset }}/out working-directory: build/${{ env.preset }}/out
env: env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj/data PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-linux/share/proj
run: ./run_benchmarks run: ./run_benchmarks
- name: Coverage - name: Coverage

2
.github/workflows/windows.yml vendored
View file

@ -107,7 +107,7 @@ jobs:
continue-on-error: true continue-on-error: true
working-directory: build/${{ env.preset }}/out working-directory: build/${{ env.preset }}/out
env: env:
PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj/data PROJ_LIB: ${{ github.workspace }}/build/${{ env.preset }}/vcpkg_installed/x64-windows/share/proj
run: OpenCppCoverage --modules *libmapnik* --modules mapnik*.exe --modules *.input --sources ${{ github.workspace }} --export_type binary --input_coverage=${{ github.workspace }}/ctest.cov --cover_children -- .\mapnik-test-visual.exe -j (Get-CimInstance -ClassName Win32_ComputerSystem).NumberOfLogicalProcessors --output-dir ./visual-test-result run: OpenCppCoverage --modules *libmapnik* --modules mapnik*.exe --modules *.input --sources ${{ github.workspace }} --export_type binary --input_coverage=${{ github.workspace }}/ctest.cov --cover_children -- .\mapnik-test-visual.exe -j (Get-CimInstance -ClassName Win32_ComputerSystem).NumberOfLogicalProcessors --output-dir ./visual-test-result
- name: Pack visual test results - name: Pack visual test results

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
.DS_Store .DS_Store
.vscode .vscode
.cache
*.gcov *.gcov
*.gcda *.gcda
*.gcno *.gcno

6
CMakePresets.json
View file

@ -195,7 +195,7 @@
"ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin" "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin"
}, },
"environment": { "environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj/data" "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj"
} }
}, },
{ {
@ -210,7 +210,7 @@
"CMAKE_CXX_FLAGS": "--coverage" "CMAKE_CXX_FLAGS": "--coverage"
}, },
"environment": { "environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj/data" "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj"
} }
}, },
{ {
@ -226,7 +226,7 @@
"CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage" "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
}, },
"environment": { "environment": {
"PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj/data" "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj"
} }
} }
], ],

2
test/unit/vertex_adapter/simplify_converters_test.cpp
View file

@ -37,7 +37,7 @@ void simplify(std::string const& wkt_in, double tolerance, std::string const& me
output.emplace_back(x, y); output.emplace_back(x, y);
} }
std::string wkt_out; std::string wkt_out;
REQUIRE(mapnik::util::to_wkt(wkt_out, output)); REQUIRE(mapnik::util::to_wkt(wkt_out, mapnik::geometry::geometry<double>{output}));
REQUIRE(wkt_out == expected); REQUIRE(wkt_out == expected);
} }
} }

1
vcpkg.json
View file

@ -52,7 +52,6 @@
}, },
"icu", "icu",
"libjpeg-turbo", "libjpeg-turbo",
"libodb-pgsql",
"libpng", "libpng",
"libpq", "libpq",
"libwebp", "libwebp",