diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2021-02-18 22:02:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 13:02:27 -0800 |
| commit | e7377f7992830bfc60fb2a7f43f300200822d82a (patch) | |
| tree | 3511109456949c2a1ab60176d9e27dc061a58b15 /ports/magnum-plugins | |
| parent | aef2f37056fa9481f2783bf47d18f8705dbff19a (diff) | |
| download | vcpkg-e7377f7992830bfc60fb2a7f43f300200822d82a.tar.gz vcpkg-e7377f7992830bfc60fb2a7f43f300200822d82a.zip | |
[magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (#16245)
* [magnum] Correctly deploy shaderconverter and sceneconverter plugins
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum,-plugins] Only remove plugin lib dirs for Windows platforms
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum,-plugins] Clean up deletion of plugin libs and clarify in comment
Signed-off-by: Squareys <squareys@googlemail.com>
* Update versions
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/magnum-plugins')
| -rw-r--r-- | ports/magnum-plugins/CONTROL | 2 | ||||
| -rw-r--r-- | ports/magnum-plugins/portfile.cmake | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index f80c0f96f..1826224b7 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,6 +1,6 @@ Source: magnum-plugins Version: 2020.06 -Port-Version: 2 +Port-Version: 3 Build-Depends: magnum[core] Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index 07dca2902..c90eaefe2 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -106,8 +106,17 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum) else() 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) + # On windows, plugins are "Modules" that cannot be linked as shared + # libraries, but are meant to be loaded at runtime. + # While this is handled adequately through the CMake project, the auto-magic + # linking with visual studio might try to link the import libs anyway. + # + # We delete the import libraries here to avoid the auto-magic linking + # for plugins which are loaded at runtime. + if(WIN32) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/magnum) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/magnum-d) + endif() endif() # Handle copyright |