diff options
Diffstat (limited to 'tests/auto/corelib/plugin/qpluginloader')
9 files changed, 18 insertions, 59 deletions
diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt index 64b1db677d..899ad6ca39 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## almostplugin Generic Library: ##################################################################### -qt_add_cmake_library(almostplugin +qt_internal_add_cmake_library(almostplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(almostplugin ## Scopes: ##################################################################### -qt_extend_target(almostplugin CONDITION GCC +qt_internal_extend_target(almostplugin CONDITION GCC LINK_OPTIONS "--Wl,--no-undefined" ) diff --git a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt index c8a320d2cf..fe5d6295aa 100644 --- a/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/almostplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## almostplugin Generic Library: ##################################################################### -qt_add_cmake_library(almostplugin +qt_internal_add_cmake_library(almostplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -25,7 +25,7 @@ qt_add_cmake_library(almostplugin qt_autogen_tools_initial_setup(almostplugin) # special case begin # We want the opposite of this -#qt_extend_target(almostplugin CONDITION GCC +#qt_internal_extend_target(almostplugin CONDITION GCC # LINK_OPTIONS # "--Wl,--no-undefined" #) diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt index b5ae34e9df..61de9dd479 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpluginloaderlib Generic Library: ##################################################################### -qt_add_cmake_library(tst_qpluginloaderlib +qt_internal_add_cmake_library(tst_qpluginloaderlib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -22,7 +22,7 @@ qt_add_cmake_library(tst_qpluginloaderlib ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloaderlib CONDITION MSVC +qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt index f760ce9935..7914f07c0d 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qpluginloaderlib Generic Library: ##################################################################### -qt_add_cmake_library(tst_qpluginloaderlib +qt_internal_add_cmake_library(tst_qpluginloaderlib SHARED INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" @@ -29,7 +29,7 @@ endif() ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloaderlib CONDITION MSVC +qt_internal_extend_target(tst_qpluginloaderlib CONDITION MSVC DEFINES WIN32_MSVC ) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt index bfc30d7c1d..1448ff3933 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## staticplugin Generic Library: ##################################################################### -add_cmake_library(staticplugin +qt_internal_add_cmake_library(staticplugin STATIC SOURCES main.cpp @@ -21,3 +21,5 @@ add_cmake_library(staticplugin # TEMPLATE = "lib" qt_autogen_tools_initial_setup(staticplugin) + +target_compile_definitions(staticplugin PRIVATE QT_STATICPLUGIN) diff --git a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt index 0eb42728f4..1448ff3933 100644 --- a/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/staticplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## staticplugin Generic Library: ##################################################################### -qt_add_cmake_library(staticplugin +qt_internal_add_cmake_library(staticplugin STATIC SOURCES main.cpp diff --git a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt index ef39d6cc0f..5a8bf518c5 100644 --- a/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/theplugin/CMakeLists.txt @@ -4,7 +4,7 @@ ## theplugin Generic Library: ##################################################################### -qt_add_cmake_library(theplugin +qt_internal_add_cmake_library(theplugin MODULE INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qpluginloader/bin" OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../bin" diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt deleted file mode 100644 index 0b0d76bbc4..0000000000 --- a/tests/auto/corelib/plugin/qpluginloader/tst/.prev_CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -# Generated from tst.pro. - -##################################################################### -## tst_qpluginloader Test: -##################################################################### - -# Collect test data -list(APPEND test_data "../elftest") -list(APPEND test_data "../machtest") - -qt_add_test(tst_qpluginloader - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - SOURCES - ../fakeplugin.cpp - ../theplugin/plugininterface.h - ../tst_qpluginloader.cpp - PUBLIC_LIBRARIES - staticplugin - TESTDATA ${test_data} -) - -## Scopes: -##################################################################### - -qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests - PUBLIC_LIBRARIES - Qt::CorePrivate -) - -qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release - PUBLIC_LIBRARIES - # Remove: L../staticplugin/debug -) - -qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug - PUBLIC_LIBRARIES - # Remove: L../staticplugin/release -) - -qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release - PUBLIC_LIBRARIES - # Remove: L../staticplugin -) diff --git a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt index 0b0d76bbc4..1193a9d731 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/tst/CMakeLists.txt @@ -8,7 +8,7 @@ list(APPEND test_data "../elftest") list(APPEND test_data "../machtest") -qt_add_test(tst_qpluginloader +qt_internal_add_test(tst_qpluginloader OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../fakeplugin.cpp @@ -22,22 +22,22 @@ qt_add_test(tst_qpluginloader ## Scopes: ##################################################################### -qt_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests +qt_internal_extend_target(tst_qpluginloader CONDITION QT_FEATURE_private_tests PUBLIC_LIBRARIES Qt::CorePrivate ) -qt_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release +qt_internal_extend_target(tst_qpluginloader CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND WIN32 AND debug_and_release PUBLIC_LIBRARIES # Remove: L../staticplugin/debug ) -qt_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug +qt_internal_extend_target(tst_qpluginloader CONDITION WIN32 AND debug_and_release AND NOT CMAKE_BUILD_TYPE STREQUAL Debug PUBLIC_LIBRARIES # Remove: L../staticplugin/release ) -qt_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release +qt_internal_extend_target(tst_qpluginloader CONDITION UNIX OR NOT debug_and_release PUBLIC_LIBRARIES # Remove: L../staticplugin ) |