From ac38fa11823f4cf020a9481c9de3d61caa8fccdc Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 3 Feb 2020 19:44:27 +0100 Subject: Regenerate projects to correctly handle private dependencies Change-Id: I7d84bc9962bff5c89a90367ae704974c6ce2ec89 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- src/tools/qdbuscpp2xml/.prev_CMakeLists.txt | 10 +++------- src/tools/qdbuscpp2xml/CMakeLists.txt | 2 +- src/tools/qdbusxml2cpp/.prev_CMakeLists.txt | 10 +++------- src/tools/qdbusxml2cpp/CMakeLists.txt | 2 +- 4 files changed, 8 insertions(+), 16 deletions(-) (limited to 'src/tools') 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 diff --git a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt index 202e751727..ce9438b207 100644 --- a/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/.prev_CMakeLists.txt @@ -10,7 +10,7 @@ qt_add_tool(qdbusxml2cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate ) @@ -22,15 +22,11 @@ qt_add_tool(qdbusxml2cpp ##################################################################### qt_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap - LIBRARIES - Qt::DBusPrivate PUBLIC_LIBRARIES - Qt::DBus + Qt::DBusPrivate ) qt_extend_target(qdbusxml2cpp CONDITION force_bootstrap - LIBRARIES - bootstrap_dbusPrivate PUBLIC_LIBRARIES - bootstrap_dbus + bootstrap_dbusPrivate ) diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt index f97cbb1180..63700f0b6b 100644 --- a/src/tools/qdbusxml2cpp/CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/CMakeLists.txt @@ -11,7 +11,7 @@ qt_add_tool(qdbusxml2cpp DEFINES QT_NO_CAST_FROM_ASCII QT_NO_FOREACH - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DBusPrivate # COMPILE_OPTIONS # special case -- cgit v1.2.3