From 3338ab613cf44f336e3d6a78bd06d5c12094d921 Mon Sep 17 00:00:00 2001
From: Squareys <squareys@googlemail.com>
Date: Wed, 2 May 2018 12:17:57 +0200
Subject: [PATCH] [magnum,-plugins] Also install headers for dynamically built
 plugins

While before there was no use for linking the plugins directly or using
them as libraries in some other way when built dynamically, there now are
intra-dependencies between plugins which to be detected, require the
headers to be installed.

Additionally, the folders lib/magnum and debug/lib/magnum-d are no longer
empty, as we put the plugin deploy scripts there. Removing them is
therefore superfluous.

(Prepares upcoming release/head build)

Signed-off-by: Squareys <squareys@googlemail.com>
---
 ports/magnum-plugins/portfile.cmake | 13 +++----------
 ports/magnum/portfile.cmake         |  5 -----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
index bedf9e3957..acbd708615 100644
--- a/ports/magnum-plugins/portfile.cmake
+++ b/ports/magnum-plugins/portfile.cmake
@@ -73,16 +73,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
    file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum)
 else()
-   # remove headers and libs for plugins
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include)
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib)
-   # hint vcpkg
-   set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
-   set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/MagnumPlugins)
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d)
+    set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d)
 endif()
 
 # Handle copyright
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index af22fbb603..dece1caa96 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -90,11 +90,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
    file(COPY ${LIB_TO_MOVE_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum)
 else()
-   # remove headers and libs for plugins
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/MagnumPlugins)
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum)
-   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d)
-
    file(COPY ${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/bin/magnum)
    file(COPY ${CMAKE_CURRENT_LIST_DIR}/magnumdeploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/magnum-d)
 endif()