1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't link against dbus-1_nolink when dbus_linked feature is off

Browse Source 
dbus1_linked is only evaluated to true when the dbus package is found.
If it was not found, then it makes no sense to link against the
_nolink target, because no package was found in the first place.

When the package is not found, QtDBus uses a minimal dbus header which
is included with QtDBus sources, so there is no need for the _nolink
target.

This amends cc141cc5c61d086d6938e2c7312ec02e5f79734c and fixes a build
failure on macOS.

Change-Id: I71dcbb7465ad13b0bf03579f51412c373125caba
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Alexandru Croitor 2019-05-07 19:46:57 +02:00
parent 0c498ef4ff
commit 0efe6fc90f
3 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dbus/CMakeLists.txt
View File

@ -60,18 +60,10 @@ set_source_files_properties(qdbusmarshaller.cpp
extend_target(DBus CONDITION QT_FEATURE_dbus_linked
DEFINES
QT_LINKED_LIBDBUS
PUBLIC_LIBRARIES # special case
LIBRARIES
dbus-1
)
# begin special case:
extend_target(DBus CONDITION NOT QT_FEATURE_dbus_linked
PUBLIC_LIBRARIES
dbus-1_nolink
)
# end special case:
extend_target(DBus CONDITION WIN32
LIBRARIES
advapi32

17
tests/auto/dbus/qdbusinterface/CMakeLists.txt
View File

@ -1,26 +1,41 @@
# Generated from qdbusinterface.pro.
# special case begin
add_subdirectory(qmyserver)
#####################################################################
## ../tst_qdbusinterface Test:
#####################################################################
add_qt_test(tst_qdbusinterface
SOURCES
myobject.h
tst_qdbusinterface.cpp
LIBRARIES
Qt::CorePrivate
Qt::DBus
Qt::DBusPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
)
#### Keys ignored in scope 1:.:.:qdbusinterface.pro:<TRUE>:
# CONFIG = "testcase"
# DESTDIR = "./"
## Scopes:
#####################################################################
extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked
DEFINES
QT_LINKED_LIBDBUS
PUBLIC_LIBRARIES
dbus-1
)
extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked
SOURCES
../../../../src/dbus/qdbus_symbols.cpp
)
# special case end

24
tests/auto/dbus/qdbustype/CMakeLists.txt
View File

@ -10,17 +10,25 @@ add_qt_test(tst_qdbustype
LIBRARIES
Qt::CorePrivate
Qt::DBusPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
)
#### Keys ignored in scope 1:.:.:qdbustype.pro:<TRUE>:
# CONFIG = "testcase" "parallel_test"
## Scopes:
#####################################################################
extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
DEFINES
QT_LINKED_LIBDBUS
)
extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked
DEFINES
QT_LINKED_LIBDBUS
LIBRARIES
dbus-1
)
extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
SOURCES
../../../../src/dbus/qdbus_symbols.cpp
)
extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked
SOURCES
../../../../src/dbus/qdbus_symbols.cpp
)