diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:35:07 +0100 |
commit | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (patch) | |
tree | c9d6c1d1fe90dba3c788fd06795cf05a6d4ed5bb /src/tools/qdbuscpp2xml | |
parent | 71436d5499a9e0355f778f47ef465486a727049d (diff) | |
parent | c431e2d33c2b13dee8b43a08c267c20ec1ae9654 (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
Diffstat (limited to 'src/tools/qdbuscpp2xml')
-rw-r--r-- | src/tools/qdbuscpp2xml/.prev_CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/tools/qdbuscpp2xml/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt index 9d51b4eac9..58a8ea2b08 100644 --- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt @@ -23,7 +23,7 @@ qt_add_tool(qdbuscpp2xml INCLUDE_DIRECTORIES ../moc ../moc/../../3rdparty/tinycbor/src - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) @@ -35,15 +35,11 @@ qt_add_tool(qdbuscpp2xml ##################################################################### qt_extend_target(qdbuscpp2xml CONDITION force_bootstrap - LIBRARIES - bootstrap_dbusPrivate PUBLIC_LIBRARIES - bootstrap_dbus + bootstrap_dbusPrivate ) qt_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap - LIBRARIES - Qt::DBusPrivate PUBLIC_LIBRARIES - Qt::DBus + Qt::DBusPrivate ) diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index 499e5fb6ae..46582793a1 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -24,7 +24,7 @@ qt_add_tool(qdbuscpp2xml INCLUDE_DIRECTORIES ../moc ../moc/../../3rdparty/tinycbor/src - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate # COMPILE_OPTIONS # special case |