Merge pull request #27 from muesli/master

Build system & ifdef fixes
lastfm · Oct 2, 2014 · fb089f6 · fb089f6
2 parents e4952ff + d9bea7b
commit fb089f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,7 +38,9 @@ if(Qt5Core_DIR)
     set(LASTFM_LIB_VERSION_SUFFIX 5)
     message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..")
     include_directories(${Qt5Core_INCLUDE_DIRS})
-    find_package(Qt5DBus REQUIRED)
+    if(UNIX AND NOT APPLE)
+        find_package(Qt5DBus REQUIRED)
+    endif()
 
 #     macro(qt_wrap_ui)
 #         qt5_wrap_ui(${ARGN})

diff --git a/src/InternetConnectionMonitor.cpp b/src/InternetConnectionMonitor.cpp
@@ -131,11 +131,11 @@ lastfm::InternetConnectionMonitor::createNetworkConnectionMonitor()
 {
     NetworkConnectionMonitor* ncm = 0;
 
-#ifdef defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
     ncm = new MNetworkConnectionMonitor( this );
 #elif defined(Q_OS_WIN) && ! defined __MINGW32__
     ncm = new WNetworkConnectionMonitor( this );
-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_LINUX)
     ncm = new LNetworkConnectionMonitor( this );
 #endif
 

diff --git a/src/misc.cpp b/src/misc.cpp
@@ -62,7 +62,7 @@ static QDir dataDotDot()
     return QDir::home();
 #elif defined(Q_OS_MAC)
     return QDir::home().filePath( "Library/Application Support" );
-#elif defined(Q_OS_UNIX)
+#elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
     return QDir::home().filePath( ".local/share" );
 #else
     return QDir::home();
@@ -199,7 +199,7 @@ lastfm::platform()
 
         default:                      return "Unknown";
     }
-#elif defined Q_OS_UNIX
+#elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
     return "UNIX X11";
 #else
     return "Unknown";