diff options
| author | Mathis <mathisloge@gmail.com> | 2021-09-17 01:16:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 16:16:18 -0700 |
| commit | c26101d71e1e3f8a8a010bf6854c983ab777b9e9 (patch) | |
| tree | be5ecbab6680ab4759ca0dee4820e40740c73823 /ports/mapnik/use-proj.patch | |
| parent | 30a3d841d88dbf1e668d875bcfc050aacdedc63b (diff) | |
| download | vcpkg-c26101d71e1e3f8a8a010bf6854c983ab777b9e9.tar.gz vcpkg-c26101d71e1e3f8a8a010bf6854c983ab777b9e9.zip | |
[Mapnik] new port (#18849)
* add mapnik
* version
* update to latest ref
* overwrite version
* latest ref
* fix hash
* verison
* update to latest upstream
* version
* false jpeg lib
* version
* update to latest ref
* verssion
* proj not needed
* versioon
* fix proj patch
* version
* actually the linkage is already checked in `supports`. Apply latest policies. Added default features
* version
* update to original ref
* enable dynamic again
* version
* use date version
* update version
* do not add a second version
* fix linux installing
* version
* Apply suggestions from code review
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* do not use port var
* version
* drop mapnik::core from general usage info.
* version
* don't add a new version
* add comment to trigger ci
* version
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'ports/mapnik/use-proj.patch')
| -rw-r--r-- | ports/mapnik/use-proj.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/ports/mapnik/use-proj.patch b/ports/mapnik/use-proj.patch new file mode 100644 index 000000000..35e588e37 --- /dev/null +++ b/ports/mapnik/use-proj.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 54dda37..e82a817 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -254,21 +254,21 @@ endif()
+
+ if(USE_PROJ)
+ #https://proj.org/development/cmake.html
+ mapnik_find_package(PROJ QUIET)
+ # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config
+ if(NOT PROJ_FOUND)
+ message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...")
+ pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj)
+ string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ_VERSION}")
+ set(PROJ_VERSION_MAJOR "${CMAKE_MATCH_1}")
+ set(PROJ_VERSION_MINOR "${CMAKE_MATCH_2}")
+ set(PROJ_VERSION_PATCH "${CMAKE_MATCH_3}")
+ endif()
+ math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL)
+ message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}")
+ list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION})
+- list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES})
+- list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS})
++ list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES})
++ # list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) # this adds some non existent directory when building with vcpgk -> commented out
+ endif()
+
+ if(USE_GRID_RENDERER)
|