diff options
| author | Alexandru Croitor <alexandru@croitor.qt.io> | 2020-06-08 18:21:18 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-09 09:34:17 +0200 |
| commit | db1de48291c9ce8316573eac84a9f0e56a8e1ac7 (patch) | |
| tree | a6fc1bd212094da3a8df08d4a3463d753a37af96 /tests/auto/corelib/plugin | |
| parent | 85c1009dbbb73fc9bee5911d70cdd96469ad8270 (diff) | |
CMake: Fix failing plugin tests on MinGW
MinGW plugins should not have the lib prefix in the shared library
names. Do this manually for a couple of libraries, and also for the
generic qt_add_cmake_library function.
Amends 9b0e23ef8a915a8c58808fa356f771ecdb6f020c
Change-Id: I1cfaf8fc046f86edd3e755adfa599aa0aa854ee3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/corelib/plugin')
3 files changed, 19 insertions, 0 deletions
diff --git a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt index f2de91635a..f3480200cc 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt @@ -21,6 +21,12 @@ set_target_properties(mylib PROPERTIES C_VISIBILITY_PRESET "default" CXX_VISIBILITY_PRESET "default" ) + +if(WIN32) + # CMake sets for Windows-GNU platforms the suffix "lib" + set_property(TARGET mylib PROPERTY PREFIX "") +endif() + # special case end #### Keys ignored in scope 1:.:.:lib.pro:<TRUE>: diff --git a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt index 716ad488d0..a91b99f1c2 100644 --- a/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt @@ -33,6 +33,12 @@ set_target_properties(mylib2 PROPERTIES C_VISIBILITY_PRESET "default" CXX_VISIBILITY_PRESET "default" ) + +if(WIN32) + # CMake sets for Windows-GNU platforms the suffix "lib" + set_property(TARGET mylib2 PROPERTY PREFIX "") +endif() + if (UNIX) add_dependencies(mylib2 mylib) add_custom_command(TARGET mylib2 POST_BUILD diff --git a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt index aa980eabaa..c547b75592 100644 --- a/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt +++ b/tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt @@ -14,6 +14,13 @@ add_cmake_library(tst_qpluginloaderlib Qt::Core ) +# special case begin +if(WIN32) + # CMake sets for Windows-GNU platforms the suffix "lib" + set_property(TARGET tst_qpluginloaderlib PROPERTY PREFIX "") +endif() +# special case begin + #### Keys ignored in scope 1:.:.:lib.pro:<TRUE>: # INSTALLS = "target" # TEMPLATE = "lib" |