Fix some problems with the USE_QTDBUS variable

This commit is contained in:
jfmcarreira committed 2015-03-11 11:11:05 +00:00
1 parent 90eb3fe51f
commit bcd444888d
3 files changed
+21 -18

No files matched your search

+16 -10
View File
@@ -16,9 +16,23 @@ SET( PLAYUVER_VERSION_MINOR "5" )
SET( PLAYUVER_VERSION_PATCH "1" ) SET( PLAYUVER_VERSION_PATCH "1" )
SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}") 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. # To be switched on when releasing.
OPTION(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" ON) OPTION(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" ON)
# Get current version. # Get current version.
set(PLAYUVER_VERSION_STRING "${PLAYUVER_VERSION}") set(PLAYUVER_VERSION_STRING "${PLAYUVER_VERSION}")
if(NOT RELEASE_BUILD AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git) 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() ENDIF()
SET( CMAKE_CXX_FLAGS "" ) 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 # Dependencies
###################################################################################### ######################################################################################
@@ -137,6 +141,8 @@ IF( ${PLAYUVER_BUILD_APP} )
ADD_SUBDIRECTORY( app ) ADD_SUBDIRECTORY( app )
ENDIF() ENDIF()
message("qtdbus = ${USE_QTDBUS}")
CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h ) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
###################################################################################### ######################################################################################
+5 -6
View File
@@ -14,8 +14,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../
# Qt library # Qt library
###################################################################################### ######################################################################################
OPTION( USE_QT4 "Build with Qt4" OFF )
IF( USE_QT4 ) IF( USE_QT4 )
FIND_PACKAGE( Qt4 REQUIRED COMPONENTS QtCore QtGui QtDBus QtNetwork QtWebKit ) FIND_PACKAGE( Qt4 REQUIRED COMPONENTS QtCore QtGui QtDBus QtNetwork QtWebKit )
@@ -36,14 +34,15 @@ IF( NOT USE_QT4 )
FIND_PACKAGE( Qt5DBus ) FIND_PACKAGE( Qt5DBus )
IF( ${Qt5DBus_FOUND} ) 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_LINKER_LIBS Qt5::DBus )
LIST(APPEND QT_MODULES DBus ) LIST(APPEND QT_MODULES DBus )
ENDIF() ENDIF()
ENDIF() ENDIF()
set(plaYUver_App_SRCS set(plaYUVer_App_SRCS
# Main # Main
main.cpp main.cpp
plaYUVerApp.cpp plaYUVerApp.cpp
@@ -77,7 +76,7 @@ set(plaYUver_App_SRCS
) )
IF( USE_QTDBUS ) IF( USE_QTDBUS )
LIST( APPEND plaYUver_App_SRCS PlaYUVerAppAdaptor.cpp ) LIST( APPEND plaYUVer_App_SRCS PlaYUVerAppAdaptor.cpp )
ENDIF() ENDIF()
@@ -168,7 +167,7 @@ IF( WIN32 )
ENDIF() 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} ) TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PlaYUVerLib PlaYUVerModules ${APP_LINKER_LIBS} ${QT_LINKER_LIBS} )
-2
View File
@@ -2,8 +2,6 @@
# DLLs and Win32 specific code # DLLs and Win32 specific code
###################################################################################### ######################################################################################
SET( USE_QTDBUS FALSE )
foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG ) string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "." ) set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "." )