From 3001e0c78aeb50364bb5a859cc8bc0ae33d99966 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 22 Jul 2021 20:44:36 +0200 Subject: [PATCH] Revert "remove openjpeg again. was just a test." This reverts commit bcc66a739c2b5ce4becd559e0fc6dc5d4c0b2db4. --- CMakeLists.txt | 11 +++++++++-- demo/c++/CMakeLists.txt | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54dda37ed..11a6da261 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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_VARIANT "Use a external mapnik/variant. If off, use the submodule" OFF) 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_TIFF "adds tiff support" ON) option(USE_WEBP "adds webp support" ON) @@ -210,7 +214,6 @@ if(USE_BIGINT) message(STATUS "uses BIGINT") list(APPEND MAPNIK_COMPILE_DEFS BIGINT) endif() - if(USE_MEMORY_MAPPED_FILE) message(STATUS "uses 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_OPTIONAL_LIBS LibXml2::LibXml2) endif() - if(USE_PNG) mapnik_find_package(PNG REQUIRED) list(APPEND MAPNIK_COMPILE_DEFS HAVE_PNG) list(APPEND MAPNIK_OPTIONAL_LIBS PNG::PNG) 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) mapnik_find_package(JPEG REQUIRED) list(APPEND MAPNIK_COMPILE_DEFS HAVE_JPEG) diff --git a/demo/c++/CMakeLists.txt b/demo/c++/CMakeLists.txt index 1ac290b6d..7b86d37f2 100644 --- a/demo/c++/CMakeLists.txt +++ b/demo/c++/CMakeLists.txt @@ -5,6 +5,6 @@ add_executable(mapnik-demo rundemo.cpp) target_link_libraries(mapnik-demo PRIVATE mapnik::core mapnik::agg mapnik::mapnik) 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_copy_dependencies(TARGETS mapnik-demo PLUGINS input-shape)