From 5a109a99fb4996d83a0b14c138e1b059812ab7c5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 22 Apr 2021 19:41:21 +0200 Subject: [PATCH] install dependencies only on windows and install plugins into correct dir --- cmake/MapnikInstall.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/MapnikInstall.cmake b/cmake/MapnikInstall.cmake index 38b6c687d..6f0cfd553 100644 --- a/cmake/MapnikInstall.cmake +++ b/cmake/MapnikInstall.cmake @@ -12,6 +12,8 @@ function(mapnik_install) ) elseif(NOT ${MAPNIK_INSTALL_ALREADY_INSTALLED} AND ${MAPNIK_INSTALL_IS_PLUGIN}) install(TARGETS ${MAPNIK_INSTALL_TARGET} + LIBRARY DESTINATION ${PLUGINS_INSTALL_DIR} + ARCHIVE DESTINATION ${PLUGINS_INSTALL_DIR} RUNTIME DESTINATION ${PLUGINS_INSTALL_DIR} ) endif() @@ -32,7 +34,7 @@ endfunction() function(mapnik_install_targets) - if(INSTALL_DEPENDENCIES) + if(INSTALL_DEPENDENCIES AND WIN32) # https://cmake.org/cmake/help/latest/policy/CMP0087.html cmake_policy(SET CMP0087 NEW) get_property(MAPNIK_INSTALLED_TARGETS GLOBAL PROPERTY TARGETS)