frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring and cleanup (#2)

Browse Source 
* make hyperion to singelton.
remove arguments for config and hyperion - both are gettable via Hyperion::getInstance

* refactor hyperiond

* remove qt4 comapt
make zeroconf mandatory
refactor hyperiond

* xbmcchecker is now a singleton

* cleanup in hyperiond
zeroconf switchable between static and shared linking

* fix xbmcchecker
This commit is contained in:
redPanther
2016-06-17 01:25:40 +02:00
committed by brindosch
parent 5206202568
commit 88fbc4dfde
51 changed files with 507 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/hyperion-x11/CMakeLists.txt
View File

@@ -1,17 +1,7 @@
# Configure minimum CMAKE version
cmake_minimum_required(VERSION 2.8)
# Set the project name
project(hyperion-x11)
# find QT
if(ENABLE_QT5)
find_package(Qt5Widgets REQUIRED)
else()
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
endif()
# Find X11
find_package(Qt5Widgets REQUIRED)
find_package(X11 REQUIRED)
include_directories(
@@ -32,12 +22,7 @@ set(Hyperion_X11_SOURCES
X11Wrapper.cpp
)
if(ENABLE_QT5)
QT5_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS})
else()
QT4_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS})
endif()
QT5_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS})
add_executable(${PROJECT_NAME}
${Hyperion_X11_HEADERS}
@@ -56,10 +41,6 @@ target_link_libraries(${PROJECT_NAME}
pthread
)
if(ENABLE_QT5)
qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network)
else()
qt4_use_modules(${PROJECT_NAME} Core Gui Network )
endif()
qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )