From 69fb4ae343777af9078e5128ec41cfb3cea2cd76 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 23 Oct 2019 14:45:20 +0200 Subject: Distinguish between qt_plugin and regular plugins If we do not encounter the load(qt_plugin) statement in the .pro file but we do see the entry CONFIG+=plugin, treat the target as a regular CMake library instead of treating it as a qt_plugin by default. Change-Id: I67ad5c865a1a5ab691a6b0d86c2db4b686aa04dd Reviewed-by: Alexandru Croitor --- .../auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt') diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt index 62653e1a65..5208a70c9d 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt @@ -1,11 +1,11 @@ # Generated from almostplugin.pro. ##################################################################### -## almostplugin Plugin: +## almostplugin Generic Library: ##################################################################### -add_qt_plugin(almostplugin - ALLOW_UNDEFINED_SYMBOLS # special case +add_cmake_library(almostplugin + MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" SOURCES @@ -22,6 +22,7 @@ add_qt_plugin(almostplugin ## Scopes: ##################################################################### +qt_autogen_tools_initial_setup(almostplugin) # special case begin # We want the opposite of this #extend_target(almostplugin CONDITION GCC -- cgit v1.2.3