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

Revert "remove openjpeg again. was just a test."

Browse source 
This reverts commit bcc66a739c.
This commit is contained in:
Mathis Logemann 2021-07-22 20:44:36 +02:00
parent bcc66a739c
commit 3001e0c78a
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -33,6 +33,10 @@ option(USE_EXTERNAL_MAPBOX_POLYLABEL "Use a external mapnik/polylabel. If off, u
option(USE_EXTERNAL_MAPBOX_PROTOZERO "Use a external mapnik/protozero. If off, use the submodule" OFF) option(USE_EXTERNAL_MAPBOX_PROTOZERO "Use a external mapnik/protozero. If off, use the submodule" OFF)
option(USE_EXTERNAL_MAPBOX_VARIANT "Use a external mapnik/variant. If off, use the submodule" OFF) option(USE_EXTERNAL_MAPBOX_VARIANT "Use a external mapnik/variant. If off, use the submodule" OFF)
option(USE_JPEG "adds jpeg support" ON) option(USE_JPEG "adds jpeg support" ON)
option(USE_OPENJPEG "adds openjpeg support" OFF)
if(USE_JPEG AND USE_OPENJPEG)
message(FATAL_ERROR "Choose either USE_JPEG OR USE_OPENJPEG")
endif()
option(USE_PNG "adds png support" ON) option(USE_PNG "adds png support" ON)
option(USE_TIFF "adds tiff support" ON) option(USE_TIFF "adds tiff support" ON)
option(USE_WEBP "adds webp support" ON) option(USE_WEBP "adds webp support" ON)
@ -210,7 +214,6 @@ if(USE_BIGINT)
message(STATUS "uses BIGINT") message(STATUS "uses BIGINT")
list(APPEND MAPNIK_COMPILE_DEFS BIGINT) list(APPEND MAPNIK_COMPILE_DEFS BIGINT)
endif() endif()
if(USE_MEMORY_MAPPED_FILE) if(USE_MEMORY_MAPPED_FILE)
message(STATUS "uses MAPNIK_MEMORY_MAPPED_FILE") message(STATUS "uses MAPNIK_MEMORY_MAPPED_FILE")
list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_MEMORY_MAPPED_FILE) list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_MEMORY_MAPPED_FILE)
@ -221,13 +224,17 @@ if(USE_LIBXML2)
list(APPEND MAPNIK_COMPILE_DEFS HAVE_LIBXML2) list(APPEND MAPNIK_COMPILE_DEFS HAVE_LIBXML2)
list(APPEND MAPNIK_OPTIONAL_LIBS LibXml2::LibXml2) list(APPEND MAPNIK_OPTIONAL_LIBS LibXml2::LibXml2)
endif() endif()
if(USE_PNG) if(USE_PNG)
mapnik_find_package(PNG REQUIRED) mapnik_find_package(PNG REQUIRED)
list(APPEND MAPNIK_COMPILE_DEFS HAVE_PNG) list(APPEND MAPNIK_COMPILE_DEFS HAVE_PNG)
list(APPEND MAPNIK_OPTIONAL_LIBS PNG::PNG) list(APPEND MAPNIK_OPTIONAL_LIBS PNG::PNG)
endif() endif()
if(USE_OPENJPEG)
mapnik_find_package(OpenJPEG REQUIRED)
list(APPEND MAPNIK_COMPILE_DEFS HAVE_JPEG)
list(APPEND MAPNIK_OPTIONAL_LIBS openjp2)
endif()
if(USE_JPEG) if(USE_JPEG)
mapnik_find_package(JPEG REQUIRED) mapnik_find_package(JPEG REQUIRED)
list(APPEND MAPNIK_COMPILE_DEFS HAVE_JPEG) list(APPEND MAPNIK_COMPILE_DEFS HAVE_JPEG)

2
demo/c++/CMakeLists.txt
View file

@ -5,6 +5,6 @@ add_executable(mapnik-demo rundemo.cpp)
target_link_libraries(mapnik-demo PRIVATE mapnik::core mapnik::agg mapnik::mapnik) target_link_libraries(mapnik-demo PRIVATE mapnik::core mapnik::agg mapnik::mapnik)
mapnik_install(TARGET mapnik-demo) mapnik_install(TARGET mapnik-demo)
mapnik_copy_plugins(TARGET mapnik-demo DESTINATION plugins/input PLUGINS input-shape input-gdal) mapnik_copy_plugins(TARGET mapnik-demo DESTINATION plugins/input PLUGINS input-shape)
mapnik_require_fonts(TARGET mapnik-demo DESTINATION fonts) mapnik_require_fonts(TARGET mapnik-demo DESTINATION fonts)
mapnik_copy_dependencies(TARGETS mapnik-demo PLUGINS input-shape) mapnik_copy_dependencies(TARGETS mapnik-demo PLUGINS input-shape)