Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use PROJ 6 API for Georeferencing #1341

Merged
merged 10 commits into from
Sep 1, 2019
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,9 @@ if(NOT TARGET PROJ4::proj)
set(PROJ4_FOUND false)
find_package(PROJ4 MODULE REQUIRED)
endif()
add_definitions(-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H)
if(NOT PROJ4_VERSION OR PROJ4_VERSION VERSION_LESS 6)
add_definitions(-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H)
endif()

if(Mapper_USE_GDAL)
find_package(GDAL REQUIRED)
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ components. Direct dependencies are:
https://www.qt.io/download-open-source/
- Clipper library (aka libpolyclipping) >= 6.1.3.a
http://www.angusj.com/delphi/clipper.php
- PROJ.4 Cartographic Projections Library >= 4.8
- PROJ Cartographic Projections Library >= 4.8
https://proj4.org/
- GDAL Geospatial Data Abstraction Library
https://www.gdal.org/
Expand Down Expand Up @@ -156,4 +156,4 @@ available together with the release binaries.
Packages for macOS and Windows are built using CPack which comes with CMake.
Android APKs are build in the same way, although not using a CPack generator.
These packages bundle all 3rd-party components (Qt binaries and translations,
PROJ.4 and GDAL binaries and data, etc.).
PROJ and GDAL binaries and data, etc.).
1 change: 1 addition & 0 deletions code-check-wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ PATTERN=" \
file_format_t.cpp \
file_import_export.cpp \
georeferencing_dialog.cpp \
georeferencing_t.cpp \
gdal_manager.cpp \
gdal_template.cpp \
gps_display.cpp \
Expand Down
Loading