Fix DBUS build

Author: jean-m-cyr

ethminer/CMakeLists.txt

@@ -21,7 +21,7 @@ if(ETHDBUS)
 	pkg_check_modules(DBUS dbus-1)
 	include_directories(${DBUS_INCLUDE_DIRS})
 	link_directories(${DBUS_LIBRARY_DIRS})
-	target_link_libraries(${EXECUTABLE} ${DBUS_LIBRARIES})
+	target_link_libraries(ethminer PRIVATE ${DBUS_LIBRARIES})
 endif()
 
 if(APICORE)

ethminer/DBusInt.h

@@ -13,15 +13,15 @@ class DBusInt
 			conn = dbus_bus_get(DBUS_BUS_SESSION, &err);
 			if (!conn)
 			{
-				cerr << "DBus error " << err.name << ": " << err.message << endl;
+				minelog << "DBus error " << err.name << ": " << err.message;
 			}
 			dbus_bus_request_name(conn, "eth.miner", DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
 			if (dbus_error_is_set(&err))
 			{
-				cerr << "DBus error " << err.name << ": " << err.message << endl;
+				minelog << "DBus error " << err.name << ": " << err.message;
 				dbus_connection_close(conn);
 			}
-			cout << "DBus initialized!" << endl;
+			minelog << "DBus initialized!";
 		}
 
 		void send(const char *hash)
@@ -30,10 +30,10 @@ class DBusInt
 			msg = dbus_message_new_signal("/eth/miner/hash", "eth.miner.monitor", "Hash");
 			if (msg == nullptr)
 			{
-				cerr << "Message is null!" << endl;
+				minelog << "Message is null!";
 			}
 			dbus_message_append_args(msg, DBUS_TYPE_STRING, &hash, DBUS_TYPE_INVALID);
-			if (!dbus_connection_send(conn, msg, nullptr)) cerr << "Error sending message!" << endl;
+			if (!dbus_connection_send(conn, msg, nullptr)) cerr << "Error sending message!";
 			dbus_message_unref(msg);
 		}
 

ethminer/main.cpp

@@ -35,10 +35,6 @@
 #include <libpoolprotocols/getwork/EthGetworkClient.h>
 #include <libpoolprotocols/testing/SimulateClient.h>
 
-#if ETH_DBUS
-#include <DBusInt.h>
-#endif
-
 #if API_CORE
 #include <libapicore/ApiServer.h>
 #include <libapicore/httpServer.h>
@@ -56,6 +52,10 @@ struct MiningChannel: public LogChannel
 
 #define minelog clog(MiningChannel)
 
+#if ETH_DBUS
+#include <ethminer/DBusInt.h>
+#endif
+
 bool g_running = false;
 
 class MinerCLI
@@ -758,7 +758,7 @@ class MinerCLI
 				minelog << mp << ' ' << f.getSolutionStats() << ' ' << f.farmLaunchedFormatted();
 
 #if ETH_DBUS
-				dbusint.send(toString(mp).data());
+				dbusint.send(toString(mp).c_str());
 #endif
 			}
 			else {