Merge branch 'master' into viewbox-refactor

mapnik · Jan 18, 2023 · d02f6e4 · d02f6e4
2 parents aa9af23 + 43a7d7e
commit d02f6e4
Show file tree

Hide file tree

Showing 130 changed files with 1,050 additions and 985 deletions.
diff --git a/.github/actions/run_tests/action.yml b/.github/actions/run_tests/action.yml
@@ -27,14 +27,14 @@ runs:
 
     - name: Test visuals (windows)
       continue-on-error: true
-      working-directory: build/${{ inputs.cmake-preset }}/out
+      working-directory: build/out
       shell: "pwsh"
       if: runner.os == 'Windows'
       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: Test visuals (linux & mac)
       continue-on-error: true
-      working-directory: build/${{ inputs.cmake-preset }}/out
+      working-directory: build/out
       shell: "bash"
       if: runner.os != 'Windows'
       run: |
@@ -45,7 +45,7 @@ runs:
         fi
 
     - name: Pack visual test results
-      working-directory: build/${{ inputs.cmake-preset }}/out
+      working-directory: build/out
       shell: "pwsh"
       run: tar cfvz visual-test-results.tar.gz ./visual-test-result
 
@@ -60,16 +60,16 @@ runs:
       uses: actions/upload-artifact@v3
       with:
         name: ${{ inputs.cmake-preset }}-visual-tests-${{ steps.run-guid.outputs.GUID }}
-        path: build/${{ inputs.cmake-preset }}/out/visual-test-results.tar.gz
+        path: build/out/visual-test-results.tar.gz
 
     - name: Run Benchmarks
-      working-directory: build/${{ inputs.cmake-preset }}/out
+      working-directory: build/out
       if: runner.os != 'Windows'
       shell: "pwsh"
       run: ./run_benchmarks
 
     - name: Collect coverage (linux & macos)
-      working-directory: build/${{ inputs.cmake-preset }}
+      working-directory: build
       if: runner.os != 'Windows'
       shell: "bash"
       run: |
@@ -81,10 +81,10 @@ runs:
       if: runner.os != 'Windows'
       uses: codecov/codecov-action@v3
       with:
-        files: build/${{ inputs.cmake-preset }}/coverage.info
+        files: build/coverage.info
 
     - name: Upload coverage to Codecov (windows)
       if: runner.os == 'Windows'
       uses: codecov/codecov-action@v3
       with:
-        files: build/${{ inputs.cmake-preset }}/out/mapnik-test-visual.cov
+        files: build/out/mapnik-test-visual.cov
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -32,6 +32,7 @@ jobs:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
         memory-mapped: ["OFF", "ON"]
+        static-build: ["OFF", "ON"]
         include:
           - os: ubuntu-latest
             mono: mono
@@ -82,7 +83,7 @@ jobs:
           echo "PRESET=${{ steps.lc_platform.outputs.lowercase }}-ci" >>${GITHUB_ENV}
 
       - name: Configure CMake
-        run: cmake -DUSE_MEMORY_MAPPED_FILE=${{ matrix.memory-mapped }} --preset ${{ env.PRESET }}
+        run: cmake -DUSE_MEMORY_MAPPED_FILE=${{ matrix.memory-mapped }} -DBUILD_SHARED_LIBS=${{ matrix.static-build }} --preset ${{ env.PRESET }}
 
       - name: Build
         run: cmake --build --preset ${{ env.PRESET }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,12 @@ For a complete change history, see the git log.
 #### Notice
 
 - Mapnik now requires C++14 compliant compiler (`-std=c++14`)
+- Mapnik now supports CMake as a build system. See [#4191](https://github.com/mapnik/mapnik/pull/4191) and the [docs](https://github.com/mapnik/mapnik/blob/master/docs/cmake-usage.md) for more info.
+
+#### Breaking Changes
+
+- Reworked datasource plugin system. Plugins now need to implement a class with the macros in `datasource_plugin.hpp` ([#4291](https://github.com/mapnik/mapnik/pull/4291))
+- mapnik now has a global `mapnik::setup()` method which have to be called before any other functions of mapnik. Defined in `mapnik.hpp`. Currently there is a auto setup functionality. It can be disabled using the cmake option `DISABLE_MAPNIK_AUTOSETUP=ON`. Note: In order not to insert this change into every code base, it is currently still called during the dynamic initialisation time. However, if mapnik is compiled statically, this function must be called.  ([#4291](https://github.com/mapnik/mapnik/pull/4291))
 
 #### Core
 
@@ -27,6 +33,7 @@ For a complete change history, see the git log.
 - Slightly improved `sql_utils::table_from_sql` ([2587bb3](https://github.com/mapnik/mapnik/commit/2587bb3a1d8db397acfa8dcc2d332da3a8a9399f))
 - Added wrappers for proper quoting in SQL query construction: `sql_utils::identifier`, `sql_utils::literal` ([7b21713](https://github.com/mapnik/mapnik/commit/7b217133e2749b82c2638551045c4edbece15086))
 - Added two-argument `sql_utils::unquote`, `sql_utils::unquote_copy` that also collapse inner quotes ([a4e8ea2](https://github.com/mapnik/mapnik/commit/a4e8ea21be297d89bbf36ba594d6c661a7a9ac81))
+- Fixed mapnik static build with static plugins ([#4291](https://github.com/mapnik/mapnik/pull/4291))
 - Reworked mapnik::enumeration<...> ([#4372](https://github.com/mapnik/mapnik/pull/4372))
 
 #### Plugins

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,6 +16,7 @@ message(STATUS "mapnik version: ${PROJECT_VERSION}")
 # https://cliutils.gitlab.io/modern-cmake/chapters/features/ides.html
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL ON) # with newer cmake versions put all find_package in global scope
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(FeatureSummary)
 include(MapnikOption)
@@ -27,8 +28,13 @@ include(CTest)
 add_feature_info(BUILD_TESTING BUILD_TESTING "Adds tests")
 
 mapnik_option(INSTALL_DEPENDENCIES "if ON, all dependencies (eg. required dlls) will be copied into CMAKE_INSTALL_PREFIX/MAPNIK_BIN_DIR." ON)
-
 mapnik_option(BUILD_SHARED_LIBS "build mapnik dynamic(ON) or static(OFF)" ON)
+mapnik_option(BUILD_SHARED_PLUGINS "build dynamic plugins" ${BUILD_SHARED_LIBS}) # use BUILD_SHARED_LIBS as default option
+mapnik_option(BUILD_SHARED_CRT "(only windows with msvc) use msvc shared crt" ON)
+if(WIN32 AND BUILD_SHARED_PLUGINS AND NOT BUILD_SHARED_LIBS)
+    message(FATAL_ERROR "static libmapnik and dynamic plugins won't work correctly")
+endif()
+
 mapnik_option(USE_EXTERNAL_MAPBOX_GEOMETRY "Use a external mapnik/geometry.hpp. If off, use the submodule" OFF)
 mapnik_option(USE_EXTERNAL_MAPBOX_POLYLABEL "Use a external mapnik/polylabel. If off, use the submodule" OFF)
 mapnik_option(USE_EXTERNAL_MAPBOX_PROTOZERO "Use a external mapnik/protozero. If off, use the submodule" OFF)
@@ -56,6 +62,8 @@ mapnik_option(USE_LOG "enables logging output. See log severity level." OFF)
 set(USE_LOG_SEVERITY "1" CACHE STRING "sets the logging severity (only applies when USE_LOG is ON")
 mapnik_option(USE_STATS "Enable statistics reporting" OFF)
 
+mapnik_option(DISABLE_MAPNIK_AUTOSETUP "disables the autosetup. Need to call mapnik::setup() then" OFF)
+
 mapnik_option(USE_PLUGIN_INPUT_CSV "adds plugin input csv" ON)
 mapnik_option(USE_PLUGIN_INPUT_GDAL "adds plugin input gdal" ON)
 mapnik_option(USE_PLUGIN_INPUT_GEOBUF "adds plugin input geobuf" ON)
@@ -87,18 +95,6 @@ mapnik_option(USE_GLIBC_WORKAROUND "see https://github.com/mapnik/mapnik/pull/37
 feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
 feature_summary(FILENAME "${CMAKE_CURRENT_BINARY_DIR}/features.log" WHAT ENABLED_FEATURES DISABLED_FEATURES)
 
-set(CMAKE_CXX_STANDARD 14 CACHE STRING "Sets the c++ standard. c++14 is minimum.")
-message(STATUS "Using c++${CMAKE_CXX_STANDARD}")
-# https://cmake.org/cmake/help/latest/prop_tgt/CXX_EXTENSIONS.html
-set(CXX_EXTENSIONS OFF CACHE STRING "Enables the compiler specific extensions.") # Fallsback to -std=c++<ver> if off
-message(STATUS "Using c++ extensions: ${CXX_EXTENSIONS}")
-# https://cmake.org/cmake/help/latest/prop_tgt/CXX_STANDARD_REQUIRED.html#prop_tgt:CXX_STANDARD_REQUIRED
-set(CXX_STANDARD_REQUIRED ON) # require the specified CMAKE_CXX_STANDARD
-
-# add debug postfix to the libraries
-set(MAPNIK_DEBUG_POSTFIX "d" CACHE STRING "sets the debug library postfix on mapnik, wkt and json")
-message(STATUS "postfix for debug libraries: ${MAPNIK_DEBUG_POSTFIX}")
-
 include(GNUInstallDirs)
 # See for more details: https://cmake.org/cmake/help/latest/manual/cmake-buildsystem.7.html
 set(MAPNIK_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "Install directory for binaries")
@@ -123,9 +119,29 @@ set(MAPNIK_COMPILE_DEFS "")
 set(MAPNIK_OPTIONAL_LIBS "")
 set(MAPNIK_OPTIONAL_LIBS_INCLUDE "")
 
+#############################
+#############################
 # Begin project configuration
+#############################
+#############################
+
+set(CMAKE_CXX_STANDARD 14 CACHE STRING "Sets the c++ standard. c++14 is minimum.")
+set(CMAKE_CXX_STANDARD_REQUIRED ON) # require the specified CMAKE_CXX_STANDARD
+set(CMAKE_CXX_EXTENSIONS OFF CACHE STRING "Enables the compiler specific extensions.") # Fallsback to -std=c++<ver> if off
+message(STATUS "Using c++${CMAKE_CXX_STANDARD}")
+message(STATUS "Using c++ extensions: ${CXX_EXTENSIONS}")
+
+# add debug postfix to the libraries
+set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "sets the debug library postfix on mapnik, wkt and json")
+message(STATUS "postfix for debug libraries: ${CMAKE_DEBUG_POSTFIX}")
+
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>$<$<BOOL:${BUILD_SHARED_CRT}>:DLL>")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}/lib")
 
 # needs to be before the first call of find_boost.
+list(APPEND MAPNIK_COMPILE_DEFS BOOST_SPIRIT_X3_HIDE_CXX17_WARNING)
 if(USE_MULTITHREADED)
     set(Boost_USE_MULTITHREADED ON)
     list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_THREADSAFE)
@@ -134,7 +150,7 @@ else()
 endif()
 
 
-find_package(PkgConfig)
+mapnik_find_package(PkgConfig REQUIRED)
 mapnik_find_threads()
 mapnik_find_package(ICU REQUIRED COMPONENTS uc i18n data)
 
@@ -163,7 +179,7 @@ else()
     # It might be possible that in future version harfbuzz could only be found via pkg-config.
     # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653
     message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...")
-    pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION})
+    mapnik_pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION})
     list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz)
 endif()
 
@@ -290,20 +306,15 @@ if(USE_TIFF)
 endif()
 
 if(USE_WEBP)
-    mapnik_find_package(WebP REQUIRED)
+    mapnik_pkg_check_modules(WebP REQUIRED IMPORTED_TARGET libwebp)
     list(APPEND MAPNIK_COMPILE_DEFS HAVE_WEBP)
-    list(APPEND MAPNIK_OPTIONAL_LIBS WebP::WebP)
+    list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::WebP)
 endif()
 
 if(USE_CAIRO)
-    if(WIN32)
-        mapnik_find_package(Cairo REQUIRED)
-        list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo)
-    else()
-        pkg_check_modules(Cairo REQUIRED IMPORTED_TARGET cairo)
-        list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::Cairo)
-    endif()
+    mapnik_pkg_check_modules(Cairo REQUIRED IMPORTED_TARGET cairo)
     list(APPEND MAPNIK_COMPILE_DEFS HAVE_CAIRO)
+    list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::Cairo)
 endif()
 
 if(USE_PROJ)
@@ -312,7 +323,7 @@ if(USE_PROJ)
     # 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>=${PROJ_MIN_VERSION})
+        mapnik_pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj>=${PROJ_MIN_VERSION})
         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}")
@@ -344,10 +355,24 @@ if(NOT WIN32)
     list(APPEND MAPNIK_OPTIONAL_LIBS ${CMAKE_DL_LIBS})
 endif()
 
+if(NOT BUILD_SHARED_PLUGINS)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_STATIC_PLUGINS)
+endif()
+# when building static, this have to be public so that all depending libs know about
+if(NOT BUILD_SHARED_LIBS)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_STATIC_DEFINE)
+endif()
+
+if(DISABLE_MAPNIK_AUTOSETUP)
+    list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_DISABLE_AUTOSETUP)
+endif()
+
 # force utf-8 source code processing
 # see https://docs.microsoft.com/de-de/cpp/build/reference/utf-8-set-source-and-executable-character-sets-to-utf-8?view=msvc-170
-add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
-add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+add_compile_options(
+    "$<$<CXX_COMPILER_ID:MSVC>:/utf-8>"
+    "$<$<CXX_COMPILER_ID:MSVC>:/EHsc>"
+)
 
 add_library(core INTERFACE)
 add_library(mapnik::core ALIAS core)
@@ -377,9 +402,20 @@ target_compile_definitions(core INTERFACE ${MAPNIK_COMPILE_DEFS})
 
 mapnik_install(core)
 
+###
+# forward declaring libraries to consume them when building static plugins (circle deps between mapnik <-> plugin_target)
+add_library(mapnik "")
+add_library(mapnik::mapnik ALIAS mapnik)
+add_library(wkt STATIC "")
+add_library(mapnik::wkt ALIAS wkt)
+add_library(json STATIC "")
+add_library(mapnik::json ALIAS json)
+# end forward declaration
+###
+
 add_subdirectory(deps)
-add_subdirectory(src)
 add_subdirectory(plugins)
+add_subdirectory(src)
 add_subdirectory(utils)
 add_subdirectory(demo)
 if(BUILD_BENCHMARK)
@@ -396,23 +432,23 @@ feature_summary(FILENAME "${CMAKE_CURRENT_BINARY_DIR}/packages.log" WHAT PACKAGE
 include(MapnikExport)
 include(MapnikExportPkgConfig)
 
-install(DIRECTORY include/ DESTINATION ${MAPNIK_INCLUDE_DIR})
-install(DIRECTORY deps/agg/include/ DESTINATION ${MAPNIK_INCLUDE_DIR})
-install(DIRECTORY deps/mapnik DESTINATION ${MAPNIK_INCLUDE_DIR})
+install(DIRECTORY include/ DESTINATION "${MAPNIK_INCLUDE_DIR}")
+install(DIRECTORY deps/agg/include/ DESTINATION "${MAPNIK_INCLUDE_DIR}")
+install(DIRECTORY deps/mapnik DESTINATION "${MAPNIK_INCLUDE_DIR}")
 file(GLOB TTF_FONT_FILES "fonts/*/*/*.ttf")
-install(FILES ${TTF_FONT_FILES} DESTINATION ${FONTS_INSTALL_DIR})
+install(FILES ${TTF_FONT_FILES} DESTINATION "${FONTS_INSTALL_DIR}")
 
 if(NOT USE_EXTERNAL_MAPBOX_GEOMETRY)
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/geometry/include/ DESTINATION ${MAPNIK_INCLUDE_DIR})
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/geometry/include/" DESTINATION "${MAPNIK_INCLUDE_DIR}")
 endif()
 if(NOT USE_EXTERNAL_MAPBOX_POLYLABEL)
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/polylabel/include/ DESTINATION ${MAPNIK_INCLUDE_DIR})
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/polylabel/include/" DESTINATION "${MAPNIK_INCLUDE_DIR}")
 endif()
 if(NOT USE_EXTERNAL_MAPBOX_PROTOZERO)
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/protozero/include/ DESTINATION ${MAPNIK_INCLUDE_DIR})
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/protozero/include/" DESTINATION "${MAPNIK_INCLUDE_DIR}")
 endif()
 if(NOT USE_EXTERNAL_MAPBOX_VARIANT)
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/variant/include/ DESTINATION ${MAPNIK_INCLUDE_DIR})
+    install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deps/mapbox/variant/include/" DESTINATION "${MAPNIK_INCLUDE_DIR}")
 endif()
 
 mapnik_install_targets()

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -17,7 +17,7 @@
         {
             "name": "default-build-dir",
             "hidden": true,
-            "binaryDir": "${sourceDir}/build/${presetName}"
+            "binaryDir": "${sourceDir}/build"
         },
         {
             "name": "debug-build",
@@ -180,8 +180,9 @@
             "cacheVariables": {
                 "BUILD_TESTING": "ON",
                 "BUILD_DEMO_VIEWER": "OFF",
-                "CMAKE_TOOLCHAIN_FILE": "vcpkg/scripts/buildsystems/vcpkg.cmake"
-            }
+                "DISABLE_MAPNIK_AUTOSETUP": "ON"
+            },
+            "toolchainFile": "vcpkg/scripts/buildsystems/vcpkg.cmake"
         },
         {
             "name": "windows-ci",
@@ -192,10 +193,10 @@
             ],
             "cacheVariables": {
                 "INSTALL_DEPENDENCIES": "ON",
-                "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/bin"
+                "ADDITIONAL_LIBARIES_PATHS": "${sourceDir}/build/vcpkg_installed/x64-windows/bin"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-windows/share/proj"
+                "PROJ_LIB": "${sourceDir}/build/vcpkg_installed/x64-windows/share/proj"
             }
         },
         {
@@ -210,7 +211,7 @@
                 "CMAKE_CXX_FLAGS": "--coverage"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-linux/share/proj"
+                "PROJ_LIB": "${sourceDir}/build/vcpkg_installed/x64-linux/share/proj"
             }
         },
         {
@@ -239,7 +240,7 @@
                 "CMAKE_CXX_FLAGS": "-fprofile-arcs -ftest-coverage"
             },
             "environment": {
-                "PROJ_LIB": "${sourceDir}/build/${presetName}/vcpkg_installed/x64-osx/share/proj"
+                "PROJ_LIB": "${sourceDir}/build/vcpkg_installed/x64-osx/share/proj"
             }
         }
     ],

diff --git a/SConstruct b/SConstruct
@@ -1879,6 +1879,7 @@ if not preconfigured:
     env.Prepend(CPPPATH = '#deps/mapbox/geometry/include')
     env.Prepend(CPPPATH = '#deps/mapbox/protozero/include')
     env.Prepend(CPPPATH = '#deps/mapbox/polylabel/include')
+    env.Prepend(CPPPATH = '#plugins/input/base/include')
     # prepend deps dir for auxillary headers
     env.Prepend(CPPPATH = '#deps')
 

diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
@@ -31,11 +31,12 @@ function(mapnik_create_benchmark)
     set(TARGET_NAME "mapnik-benchmark-${BENCHNAME}")
     add_executable(${TARGET_NAME} ${ARGV0})
     target_include_directories(${TARGET_NAME} PRIVATE include)
-    target_link_libraries(${TARGET_NAME} PRIVATE mapnik::agg mapnik::mapnik)
+    target_link_libraries(${TARGET_NAME} PRIVATE
+        mapnik::agg
+        mapnik::mapnik
+        ICU::data ICU::i18n ICU::uc # needed for the static build (TODO: why isn't this correctly propagated from mapnik::mapnik?)
+    )
     set_target_properties(${TARGET_NAME} PROPERTIES
-        LIBRARY_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}"
-        RUNTIME_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}"
-        ARCHIVE_OUTPUT_DIRECTORY "${MAPNIK_OUTPUT_DIR}/lib"
         OUTPUT_NAME "${BENCHNAME}"
     )
 endfunction()