Fix USE_QTDBUS var

This commit is contained in:
2015-03-11 02:41:43 +00:00
parent 02f9c78044
commit 90eb3fe51f
2 changed files with 5 additions and 12 deletions
+1 -6
View File
@@ -103,11 +103,6 @@ IF( WIN32 )
INCLUDE( cmake/Win32.cmake )
ENDIF()
######################################################################################
# Configuration
######################################################################################
CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
######################################################################################
# Target App
######################################################################################
@@ -142,7 +137,7 @@ IF( ${PLAYUVER_BUILD_APP} )
ADD_SUBDIRECTORY( app )
ENDIF()
CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
######################################################################################
# Final information dump
+4 -6
View File
@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../
# Qt library
######################################################################################
OPTION( USE_QT4 "Build with Qt4" OFF )
OPTION( USE_QT4 "Build with Qt4" OFF )
IF( USE_QT4 )
@@ -31,18 +31,16 @@ ENDIF()
IF( NOT USE_QT4 )
FIND_PACKAGE( Qt5 REQUIRED COMPONENTS Core Gui Widgets PrintSupport Concurrent )
FIND_PACKAGE( Qt5DBus )
LIST(APPEND QT_LINKER_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Concurrent )
LIST(APPEND QT_MODULES Core Gui Widgets PrintSupport Concurrent )
FIND_PACKAGE( Qt5DBus )
IF( ${Qt5DBus_FOUND} )
SET( USE_QTDBUS ${Qt5DBus_FOUND} )
SET( USE_QTDBUS TRUE PARENT_SCOPE)
LIST(APPEND QT_LINKER_LIBS Qt5::DBus )
LIST(APPEND QT_MODULES DBus )
ENDIF()
#INCLUDE_DIRECTORIES( ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
#SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}" )
ENDIF()
set(plaYUver_App_SRCS