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

14
src/hyperion-remote/CMakeLists.txt
View File

@@ -1,15 +1,9 @@
cmake_minimum_required(VERSION 2.8)
project(hyperion-remote)
# find Qt
if(ENABLE_QT5)
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
# set(CMAKE_CXX_FLAGS "-fPIC")
else()
find_package(Qt4 REQUIRED QtCore QtGui QtNetwork)
endif()
# The following I do not undrstand completely...
# libQtCore.so uses some hardcoded library path inside which are incorrect after copying the file RPi file system
@@ -36,11 +30,7 @@ target_link_libraries(${PROJECT_NAME}
getoptPlusPlus
${QT_LIBRARIES})
if(ENABLE_QT5)
qt5_use_modules(${PROJECT_NAME} Widgets Core Network)
else()
qt4_use_modules(${PROJECT_NAME} Core Gui Network )
endif()
qt5_use_modules(${PROJECT_NAME} Widgets Core Network)
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT ambilight )