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

- 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

View File

@@ -38,7 +38,7 @@ target_link_libraries(bonjour
hyperion-utils
${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)
target_link_libraries(bonjour

View File

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