From bcd444888de0db301ce8ca8d8f4796affe15994b Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Wed, 11 Mar 2015 11:11:05 +0000
Subject: [PATCH] Fix some problems with the USE_QTDBUS variable

---
 CMakeLists.txt     | 26 ++++++++++++++++----------
 app/CMakeLists.txt | 11 +++++------
 cmake/Win32.cmake  |  2 --
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c45a2b3..8316a11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,23 @@ SET( PLAYUVER_VERSION_MINOR "5" )
 SET( PLAYUVER_VERSION_PATCH "1" )
 SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}")
 
+
+######################################################################################
+# Variables
+######################################################################################
+
+OPTION( PLAYUVER_BUILD_APP      "Build GUI Application"                 ON  )
+OPTION( PLAYUVER_BUILD_TOOLS    "Build Command Line Application"        ON  )
+OPTION( USE_SSE                 "Build with SSE support"                OFF )
+OPTION( USE_FERVOR              "Add Fervor support"                    OFF )
+OPTION( USE_WERROR              "Warnings as errors"                    OFF )
+OPTION( USE_QT4                 "Build with Qt4"                        OFF )
+OPTION( USE_QTDBUS              "Build with Qt4"                        OFF )
 # To be switched on when releasing.
 OPTION(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" ON)
 
+
+
 # Get current version.
 set(PLAYUVER_VERSION_STRING "${PLAYUVER_VERSION}")
 if(NOT RELEASE_BUILD AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
@@ -64,16 +78,6 @@ IF(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8")
 ENDIF()
 SET( CMAKE_CXX_FLAGS "" )
 
-######################################################################################
-# Variables
-######################################################################################
-
-OPTION( PLAYUVER_BUILD_APP      "Build GUI Application"                ON  )
-OPTION( PLAYUVER_BUILD_TOOLS    "Build Command Line Application"       ON  )
-OPTION( USE_SSE                 "Build with SSE support"               OFF )
-OPTION( USE_FERVOR              "Add Fervor support"                   OFF )
-OPTION( USE_WERROR              "Warnings as errors"                   OFF )
-
 ######################################################################################
 # Dependencies
 ######################################################################################
@@ -137,6 +141,8 @@ IF( ${PLAYUVER_BUILD_APP} )
   ADD_SUBDIRECTORY( app )
 ENDIF()
 
+message("qtdbus = ${USE_QTDBUS}")
+
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 
 ######################################################################################
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 5c53d1f..b4464f0 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -14,8 +14,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../
 # Qt library
 ######################################################################################
 
-OPTION( USE_QT4     "Build with Qt4"            OFF )
-
 IF( USE_QT4 )
 
   FIND_PACKAGE( Qt4 REQUIRED COMPONENTS QtCore QtGui QtDBus QtNetwork QtWebKit )
@@ -36,14 +34,15 @@ IF( NOT USE_QT4 )
 
   FIND_PACKAGE( Qt5DBus )
   IF( ${Qt5DBus_FOUND} )
-    SET( USE_QTDBUS TRUE PARENT_SCOPE)
+    SET( USE_QTDBUS ${Qt5DBus_FOUND} ) # TODO: fix this stupid variable
+    SET( USE_QTDBUS ${Qt5DBus_FOUND} PARENT_SCOPE)
     LIST(APPEND QT_LINKER_LIBS Qt5::DBus )
     LIST(APPEND QT_MODULES DBus )
   ENDIF()
 
 ENDIF()
 
-set(plaYUver_App_SRCS
+set(plaYUVer_App_SRCS
 # Main
     main.cpp
     plaYUVerApp.cpp
@@ -77,7 +76,7 @@ set(plaYUver_App_SRCS
 )
 
 IF( USE_QTDBUS )
-  LIST( APPEND plaYUver_App_SRCS  PlaYUVerAppAdaptor.cpp )
+  LIST( APPEND plaYUVer_App_SRCS  PlaYUVerAppAdaptor.cpp )
 ENDIF()
 
 
@@ -168,7 +167,7 @@ IF( WIN32 )
 ENDIF()
 
 
-ADD_EXECUTABLE( ${PROJECT_NAME} ${plaYUver_App_SRCS} ${HEADERS_MOC_FILES} ${plaYUver_App_UI_Wrap} ${plaYUver_App_RCC} ${WINDOWS_RES_FILE} )
+ADD_EXECUTABLE( ${PROJECT_NAME} ${plaYUVer_App_SRCS} ${HEADERS_MOC_FILES} ${plaYUver_App_UI_Wrap} ${plaYUver_App_RCC} ${WINDOWS_RES_FILE} )
 
 TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PlaYUVerLib PlaYUVerModules ${APP_LINKER_LIBS} ${QT_LINKER_LIBS} )
 
diff --git a/cmake/Win32.cmake b/cmake/Win32.cmake
index e15a435..4f16659 100644
--- a/cmake/Win32.cmake
+++ b/cmake/Win32.cmake
@@ -2,8 +2,6 @@
 # DLLs and Win32 specific code
 ######################################################################################
 
-SET( USE_QTDBUS FALSE )
-
 foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
     string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
     set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "." )