<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/129590/">https://git.reviewboard.kde.org/r/129590/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On Januar 8th, 2017, 6:53 nachm. CET, <b>David Faure</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="https://git.reviewboard.kde.org/r/129590/diff/1/?file=486841#file486841line5" style="color: black; font-weight: bold; text-decoration: underline;">autotests/CMakeLists.txt</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">5</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> message(STATUS "Qt5Test not found, autotests will not be built.")</pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">5</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> message(STATUS "Autotests will not be built, because Qt5Test wasn't found or DBus was disabled")</pre></td>
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Better split this into two, to avoid confusing people.</p></pre>
</blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">I've update the patch, but do not have access rights to upload the path, so I appended it here:</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">commit ec98addbfbba62310e050046078380c10192b829
Author: Ralf Habacker <a href="mailto:ralf.habacker@freenet.de" style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: normal;">ralf.habacker@freenet.de</a>
Date: Mon Jul 17 11:16:39 2017 +0200</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;"><div class="codehilite" style="background: #f8f8f8"><pre style="line-height: 125%"><span></span>Make building with QtDBus optional
This patch adds an ENABLE_DBUS CMake option defaulting to ON,
which can be used to make KAuth not depend on DBus.
This is useful for some apps that are running on Windows or Mac OSX.
see https://www.mail-archive.com/kde-frameworks-devel@kde.org/msg34246.html
</pre></div>
</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13a6129..c53ff15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,16 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">+option(ENABLE_DBUS "Enable D-Bus functionality" ON)
+add_feature_info(D-Bus ENABLE_DBUS "Enable D-Bus functionality")
+
+if(ENABLE_DBUS)
+ set(DBUS_PACKAGE DBus)
+ set(DBUS_LIBRARY Qt::DBus)
+endif()
+
set(REQUIRED_QT_VERSION 5.6.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets ${DBUS_PACKAGE})
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index b53d760..fe07742 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -5,6 +5,10 @@ if(NOT Qt5Test_FOUND)
message(STATUS "Qt5Test not found, autotests will not be built.")
return()
endif()
+if(NOT ENABLE_DBUS)
+ message(STATUS "Autotests will not be built, because DBus was disabled.")
+ return()
+endif()</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">qt5_add_dbus_adaptor(kauth_dbus_adaptor_tests_SRCS
../src/backends/dbus/org.kde.kf5auth.xml
@@ -39,7 +43,7 @@ target_include_directories(kauth_tests_static
${CMAKE_CURRENT_SOURCE_DIR}/../src
)</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">-target_link_libraries(kauth_tests_static PUBLIC Qt5::DBus KF5::CoreAddons)
+target_link_libraries(kauth_tests_static PUBLIC ${DBUS_LIBRARY} KF5::CoreAddons)</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">########### next target ###############</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 662a0dd..5754ceb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,7 +31,7 @@ add_library(KF5::Auth ALIAS KF5Auth)
target_include_directories(KF5Auth INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KAuth>")</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">target_link_libraries(KF5Auth PUBLIC Qt5::Core KF5::CoreAddons) # for KJob
-target_link_libraries(KF5Auth PRIVATE Qt5::Widgets Qt5::DBus)
+target_link_libraries(KF5Auth PRIVATE Qt5::Widgets ${DBUS_LIBRARY})
set_target_properties(KF5Auth PROPERTIES VERSION ${KAUTH_VERSION_STRING}
SOVERSION ${KAUTH_SOVERSION}
EXPORT_NAME Auth</p></pre>
<br />
<p>- Ralf</p>
<br />
<p>On November 30th, 2016, 10:59 vorm. CET, Gleb Popov wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: 1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
<div>Review request for KDE Frameworks and kdewin.</div>
<div>By Gleb Popov.</div>
<p style="color: grey;"><i>Updated Nov. 30, 2016, 10:59 vorm.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
kauth
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">This adds an <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">ENABLE_DBUS</code> CMake option defaulting to <code style="text-rendering: inherit;color: #4444cc;padding: 0;white-space: normal;margin: 0;line-height: inherit;">ON</code>, which can be used to make KAuth not depend on DBus. This is useful for some apps that are running on Windows.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">https://www.mail-archive.com/kde-frameworks-devel@kde.org/msg34246.html</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>CMakeLists.txt <span style="color: grey">(b8b7ba7)</span></li>
<li>autotests/CMakeLists.txt <span style="color: grey">(b53d760)</span></li>
<li>src/CMakeLists.txt <span style="color: grey">(1b6930d)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/129590/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>