From bc35478907b71bbf0bf1137bfbcb4248ddfcf720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 2 May 2020 14:18:13 +0200 Subject: [PATCH] modules: updated FindCorrade.cmake. --- modules/FindCorrade.cmake | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake index e57e4417a..ff0926e43 100644 --- a/modules/FindCorrade.cmake +++ b/modules/FindCorrade.cmake @@ -75,6 +75,9 @@ # included # CORRADE_BUILD_STATIC - Defined if compiled as static libraries. # Default are shared libraries. +# CORRADE_BUILD_STATIC_UNIQUE_GLOBALS - Defined if static libraries keep their +# globals unique even across different shared libraries. Enabled by default +# for static builds. # CORRADE_BUILD_MULTITHREADED - Defined if compiled in a way that makes it # possible to safely use certain Corrade features simultaenously in multiple # threads @@ -97,7 +100,7 @@ # with a MSVC frontend) # CORRADE_TARGET_MSVC - Defined if compiling with MSVC or Clang with # a MSVC frontend -# CORRADE_TARGET_MINGW` - Defined if compiling under MinGW +# CORRADE_TARGET_MINGW - Defined if compiling under MinGW # CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT - Defined if PluginManager # doesn't support dynamic plugin loading due to platform limitations # CORRADE_TESTSUITE_TARGET_XCTEST - Defined if TestSuite is targetting Xcode @@ -193,13 +196,19 @@ # # ...) # -# The macro adds preprocessor directive ``CORRADE_DYNAMIC_PLUGIN``. Additional -# libraries can be linked in via :command:`target_link_libraries(plugin_name ...) `. +# The macro adds a preprocessor directive ``CORRADE_DYNAMIC_PLUGIN`` when +# compiling ````. Additional libraries can be linked in via +# :command:`target_link_libraries(plugin_name ...) `. # On DLL platforms, the plugin DLLs and metadata files are put into -# ````/```` and the -# ``*.lib`` files into ````/````. -# On non-DLL platforms everything is put into ````/ -# ````. +# ```` / ```` and the +# ``*.lib`` files into ```` / +# ````. On non-DLL platforms everything is put +# into ```` / ````. +# +# If the plugin interface disables plugin metadata files, the +# ```` can be set to ``""``, in which case no metadata file is +# copied anywhere. Otherwise the metadata file is copied and renamed to +# ````, retaining its original extension. # # corrade_add_plugin( # @@ -224,8 +233,9 @@ # # ...) # -# The macro adds preprocessor directive ``CORRADE_STATIC_PLUGIN``. Additional -# libraries can be linked in via :command:`target_link_libraries(plugin_name ...) `. +# The macro adds a preprocessor directive ``CORRADE_STATIC_PLUGIN`` when +# compiling ````. Additional libraries can be linked in via +# :command:`target_link_libraries(plugin_name ...) `. # The ```` is ignored and included just for compatibility # with the :command:`corrade_add_plugin` command, everything is installed into # ````. Note that plugins built in debug configuration @@ -233,6 +243,11 @@ # suffix to make it possible to have both debug and release plugins installed # alongside each other. # +# If the plugin interface disables plugin metadata files, the +# ```` can be set to ``""``, in which case no metadata file is +# used. Otherwise the metadata file is bundled and renamed to +# ````, retaining its original extension. +# # corrade_add_static_plugin( # # @@ -307,6 +322,7 @@ set(_corradeFlags MSVC2019_COMPATIBILITY BUILD_DEPRECATED BUILD_STATIC + BUILD_STATIC_UNIQUE_GLOBALS BUILD_MULTITHREADED TARGET_UNIX TARGET_APPLE