frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

- add cmake qt check, minimum 5.2 (#40)

Browse Source 
- on x86 use dynamic avahi libs
- fix compile error
This commit is contained in:
redPanther 2016-06-23 19:56:50 +02:00 committed by brindosch
parent d4142b4eb4
commit 33ebdcaffc
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -18,6 +18,7 @@ SET ( DEFAULT_SPIDEV OFF )
SET ( DEFAULT_WS2812BPWM OFF ) SET ( DEFAULT_WS2812BPWM OFF )
SET ( DEFAULT_WS281XPWM OFF ) SET ( DEFAULT_WS281XPWM OFF )
SET ( DEFAULT_ZEROCONF ON ) SET ( DEFAULT_ZEROCONF ON )
SET ( DEFAULT_USE_SHARED_AVAHI_LIBS OFF )
if (APPLE) if (APPLE)
SET ( DEFAULT_OSX ON ) SET ( DEFAULT_OSX ON )
@ -36,6 +37,7 @@ else ()
elseif ( "${PLATFORM}" STREQUAL "x86" ) elseif ( "${PLATFORM}" STREQUAL "x86" )
SET ( DEFAULT_X11 ON ) SET ( DEFAULT_X11 ON )
SET ( DEFAULT_FB ON ) SET ( DEFAULT_FB ON )
SET ( DEFAULT_USE_SHARED_AVAHI_LIBS ON )
elseif ( "${PLATFORM}" STREQUAL "imx6" ) elseif ( "${PLATFORM}" STREQUAL "imx6" )
SET ( DEFAULT_FB ON ) SET ( DEFAULT_FB ON )
endif() endif()
@ -133,8 +135,14 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11 -Wall") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11 -Wall")
find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) SET(QT_MIN_VERSION "5.2.0")
find_package(Qt5 COMPONENTS Core Gui Network REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
message( STATUS "Found Qt Version: ${Qt5Core_VERSION}" )
IF ( "${Qt5Core_VERSION}" VERSION_LESS "${QT_MIN_VERSION}" )
message( FATAL_ERROR "Your Qt version is to old! Minimum required ${QT_MIN_VERSION}" )
ENDIF()
#add libusb and pthreads #add libusb and pthreads
find_package(libusb-1.0 REQUIRED) find_package(libusb-1.0 REQUIRED)

2
libsrc/bonjour/CMakeLists.txt
View File

@ -38,7 +38,7 @@ target_link_libraries(bonjour
hyperion-utils hyperion-utils
${QT_LIBRARIES}) ${QT_LIBRARIES})
set(USE_SHARED_AVAHI_LIBS OFF CACHE BOOL "use avahi libraries from system") set(USE_SHARED_AVAHI_LIBS ${DEFAULT_USE_SHARED_AVAHI_LIBS} CACHE BOOL "use avahi libraries from system")
if (USE_SHARED_AVAHI_LIBS) if (USE_SHARED_AVAHI_LIBS)
target_link_libraries(bonjour target_link_libraries(bonjour

2
libsrc/effectengine/EffectEngine.cpp
View File

@ -50,7 +50,7 @@ EffectEngine::EffectEngine(Hyperion * hyperion, const Json::Value & jsonEffectCo
efxCount++; efxCount++;
} }
} }
Info(_log, "%d effects loaded from directory %s", efxCount, path); Info(_log, "%d effects loaded from directory %s", efxCount, path.c_str());
} }
} }