diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-16 12:37:39 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-12-17 14:17:35 +0100 |
| commit | 1ec4a7eddc9d521cb84fdf2fe19608f2d446bcb8 (patch) | |
| tree | e86a16db0bf7226d5525404a4888e8ee16fe20ad /src | |
| parent | 2eb77139a2deeb88c4d517dd5131f3e45d6acc1f (diff) | |
CMake: Fix 'static' conditions
The pro2cmake script doesn't handle static scopes correctly, and the
generated "CONDITION static" must read "CONDITION NOT
QT_BUILD_SHARED_LIBS".
Change-Id: Ic5a5763e9fd5f5d04fb4c12227cbe85fac17b826
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 3 deletions
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} ) |