From be2466dfa72b26befc9b27c6f27e4d74f4acd6f4 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Thu, 29 Jul 2021 14:44:48 +0200
Subject: [PATCH] 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>
---
 cmake/QtCreatorAPI.cmake                | 24 +-----------------------
 src/libs/qtcreatorcdbext/CMakeLists.txt |  1 -
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index ac97e74fc4c..4496c17ef52 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()
diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt
index c2a7c60a2ef..22808c284dd 100644
--- a/src/libs/qtcreatorcdbext/CMakeLists.txt
+++ b/src/libs/qtcreatorcdbext/CMakeLists.txt
@@ -39,7 +39,6 @@ endforeach()
 
 add_qtc_library(qtcreatorcdbext
   COMPONENT qtcreatorcdbext
-  UNVERSIONED
   DEPENDS ${DbgEngLib}
   DESTINATION lib/qtcreatorcdbext${ArchSuffix}/
   SOURCES