diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2021-07-29 14:44:48 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2021-09-10 12:43:19 +0000 |
| commit | be2466dfa72b26befc9b27c6f27e4d74f4acd6f4 (patch) | |
| tree | 48fda4210362c9f1203e63cbc4861822ca0b82c7 /cmake | |
| parent | 2fc0ce4843299ea1587b167184c397ad0a99446d (diff) | |
CMake: Remove major version number dll suffix
This was done to have qmake parity when we compared the qmake and cmake
release builds.
Since we are past that now, and the cmake build is the one used to do
releases, we can drop the number from the dlls.
Change-Id: I60d1b368daf4258884c239204c2e3c18f244e930
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtCreatorAPI.cmake | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index ac97e74fc4..4496c17ef5 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -110,7 +110,7 @@ function(qtc_source_dir varName) endfunction() function(add_qtc_library name) - cmake_parse_arguments(_arg "STATIC;OBJECT;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;UNVERSIONED;FEATURE_INFO;SKIP_PCH" + cmake_parse_arguments(_arg "STATIC;OBJECT;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;FEATURE_INFO;SKIP_PCH" "DESTINATION;COMPONENT;SOURCES_PREFIX;BUILD_DEFAULT" "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN} ) @@ -262,17 +262,6 @@ function(add_qtc_library name) enable_pch(${name}) endif() - if (WIN32 AND library_type STREQUAL "SHARED" AND NOT _arg_UNVERSIONED) - # Match qmake naming scheme e.g. Library4.dll - set_target_properties(${name} PROPERTIES - SUFFIX "${IDE_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}" - PREFIX "" - IMPORT_SUFFIX "${IDE_VERSION_MAJOR}${CMAKE_IMPORT_LIBRARY_SUFFIX}" - IMPORT_PREFIX "" - PDB_NAME "${name}${IDE_VERSION_MAJOR}${.pdb}" - ) - endif() - unset(NAMELINK_OPTION) if (library_type STREQUAL "SHARED") set(NAMELINK_OPTION NAMELINK_SKIP) @@ -518,17 +507,6 @@ function(add_qtc_plugin target_name) ${_arg_PROPERTIES} ) - if (WIN32) - # Match qmake naming scheme e.g. Plugin4.dll - string(REGEX MATCH "^[0-9]*" IDE_VERSION_MAJOR ${IDE_VERSION}) - set_target_properties(${target_name} PROPERTIES - SUFFIX "${IDE_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}" - PREFIX "" - IMPORT_SUFFIX "${IDE_VERSION_MAJOR}${CMAKE_IMPORT_LIBRARY_SUFFIX}" - IMPORT_PREFIX "" - PDB_NAME "${name}${IDE_VERSION_MAJOR}${.pdb}" - ) - endif() if (NOT _arg_SKIP_PCH) enable_pch(${target_name}) endif() |