diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 6be26eec09..a33a4d2ac9 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -565,7 +565,7 @@ qt_internal_extend_target(Core CONDITION INTEGRITY #) # special case end -qt_internal_extend_target(Core CONDITION LINUX AND NOT static +qt_internal_extend_target(Core CONDITION LINUX AND QT_BUILD_SHARED_LIBS SOURCES global/minimum-linux_p.h ) @@ -582,7 +582,7 @@ qt_internal_extend_target(Core CONDITION LINUX AND NOT static #### Keys ignored in scope 35:.:global:global/global.pri:silent: # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&" -qt_internal_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static +qt_internal_extend_target(Core CONDITION LINUX AND NOT precompile_header AND QT_BUILD_SHARED_LIBS SOURCES global/minimum-linux.S ) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt index 24cdf8f636..9ebc98ea53 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt @@ -34,7 +34,8 @@ qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_xcb_glx XCB::GLX ) -qt_internal_extend_target(QXcbGlxIntegrationPlugin CONDITION QT_FEATURE_dlopen AND NOT static +qt_internal_extend_target(QXcbGlxIntegrationPlugin + CONDITION QT_FEATURE_dlopen AND QT_BUILD_SHARED_LIBS PUBLIC_LIBRARIES ${CMAKE_DL_LIBS} )