feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Ensure qtcreatorcdbext is a shared library for all cases

Browse Source 
qtcreatorcdbext.dll is being loaded by cdb.exe and needs to be a
shared library always.

Change-Id: I13582f295744d350907284ea02e08ce1e8055dbe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Cristian Adam
2022-05-03 15:11:53 +02:00
parent 8e931838ef
commit 19f5b835de
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtCreatorAPI.cmake
View File

@@ -112,7 +112,7 @@ function(qtc_source_dir varName)
endfunction() endfunction()
function(add_qtc_library name) function(add_qtc_library name)
cmake_parse_arguments(_arg "STATIC;OBJECT;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;FEATURE_INFO;SKIP_PCH" cmake_parse_arguments(_arg "STATIC;OBJECT;SHARED;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;FEATURE_INFO;SKIP_PCH"
"DESTINATION;COMPONENT;SOURCES_PREFIX;BUILD_DEFAULT" "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} "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN}
) )
@@ -158,7 +158,7 @@ function(add_qtc_library name)
endif() endif()
set(library_type SHARED) set(library_type SHARED)
if (_arg_STATIC OR QTC_STATIC_BUILD) if (_arg_STATIC OR (QTC_STATIC_BUILD AND NOT _arg_SHARED))
set(library_type STATIC) set(library_type STATIC)
endif() endif()
if (_arg_OBJECT) if (_arg_OBJECT)
@@ -265,7 +265,7 @@ function(add_qtc_library name)
set(COMPONENT_OPTION "COMPONENT" "${_arg_COMPONENT}") set(COMPONENT_OPTION "COMPONENT" "${_arg_COMPONENT}")
endif() endif()
if (NOT QTC_STATIC_BUILD) if (NOT QTC_STATIC_BUILD OR _arg_SHARED)
install(TARGETS ${name} install(TARGETS ${name}
EXPORT QtCreator EXPORT QtCreator
RUNTIME RUNTIME

2
src/libs/qtcreatorcdbext/CMakeLists.txt
View File

@@ -25,7 +25,7 @@ if (CMAKE_SIZEOF_VOID_P EQUAL 8)
set(ArchSuffix 64) set(ArchSuffix 64)
endif() endif()
add_qtc_library(qtcreatorcdbext add_qtc_library(qtcreatorcdbext SHARED
COMPONENT qtcreatorcdbext COMPONENT qtcreatorcdbext
DEPENDS ${DbgEngLib} DEPENDS ${DbgEngLib}
DESTINATION lib/qtcreatorcdbext${ArchSuffix}/ DESTINATION lib/qtcreatorcdbext${ArchSuffix}/

2
src/shared/proparser/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_qtc_library(ProParser SHARED add_qtc_library(ProParser
DEPENDS Qt5::Core Utils DEPENDS Qt5::Core Utils
PUBLIC_DEFINES PUBLIC_DEFINES
QMAKE_BUILTIN_PRFS QMAKE_OVERRIDE_PRFS QMAKE_BUILTIN_PRFS QMAKE_OVERRIDE_PRFS