diff options
-rw-r--r-- | cmake/QtBuild.cmake | 4 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/qlibrary/lib/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/qlibrary/lib2/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/auto/corelib/plugin/qpluginloader/lib/CMakeLists.txt | 7 |
4 files changed, 23 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 5c12c93bba..184153543d 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -3895,6 +3895,10 @@ function(qt_add_cmake_library target) # but Qt plugins are actually suffixed with .dylib. set_property(TARGET "${target}" PROPERTY SUFFIX ".dylib") endif() + if(WIN32) + # CMake sets for Windows-GNU platforms the suffix "lib" + set_property(TARGET "${target}" PROPERTY PREFIX "") + endif() else() add_library("${target}") endif() 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" |