From 873a543c6f8efe896e5d9406481a0005868d78eb Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 18 Feb 2020 18:11:37 +0100 Subject: [PATCH] CMake Build: Do not set suffix for qtcreatorcdbext dll Change-Id: Id0b5692df1661fe1e20b77d1e538c01fbb974b5e Reviewed-by: Eike Ziller --- cmake/QtCreatorAPI.cmake | 4 ++-- src/libs/qtcreatorcdbext/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 1e0829dd675..bd9b6ac7901 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -433,7 +433,7 @@ endfunction() # function(add_qtc_library name) - cmake_parse_arguments(_arg "STATIC;OBJECT;SKIP_TRANSLATION;BUILD_BY_DEFAULT;ALLOW_ASCII_CASTS" + cmake_parse_arguments(_arg "STATIC;OBJECT;SKIP_TRANSLATION;BUILD_BY_DEFAULT;ALLOW_ASCII_CASTS;UNVERSIONED" "DESTINATION;COMPONENT" "DEFINES;DEPENDS;EXTRA_TRANSLATIONS;INCLUDES;PUBLIC_DEFINES;PUBLIC_DEPENDS;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;PROPERTIES" ${ARGN} ) @@ -547,7 +547,7 @@ function(add_qtc_library name) ) enable_pch(${name}) - if (WIN32 AND library_type STREQUAL "SHARED") + 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 "${PROJECT_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}" diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt index 1fdf656e9e1..b08a833b7a6 100644 --- a/src/libs/qtcreatorcdbext/CMakeLists.txt +++ b/src/libs/qtcreatorcdbext/CMakeLists.txt @@ -35,6 +35,7 @@ endif() add_qtc_library(qtcreatorcdbext COMPONENT qtcreatorcdbext BUILD_BY_DEFAULT + UNVERSIONED DEPENDS ${DbgEngLib} DESTINATION lib/qtcreatorcdbext${ArchSuffix}/ SOURCES