From 1e8532e42b1980851d8e3ffaef655139588f9dfb Mon Sep 17 00:00:00 2001 From: Portisch Date: Tue, 12 Feb 2019 14:55:36 +0100 Subject: [PATCH] fix amlogic compile --- dependencies/CMakeLists.txt | 31 +++++++++++++++++------- include/bonjour/bonjourservicebrowser.h | 4 +++ include/bonjour/bonjourserviceregister.h | 4 +++ include/bonjour/bonjourserviceresolver.h | 6 +++-- src/hyperion-aml/CMakeLists.txt | 6 +++++ src/hyperion-framebuffer/CMakeLists.txt | 6 +++++ src/hyperion-remote/CMakeLists.txt | 6 +++++ src/hyperion-v4l2/CMakeLists.txt | 6 +++++ src/hyperiond/CMakeLists.txt | 7 ++++++ 9 files changed, 65 insertions(+), 11 deletions(-) diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt index 4efc3fcd..1ff24f50 100644 --- a/dependencies/CMakeLists.txt +++ b/dependencies/CMakeLists.txt @@ -12,7 +12,11 @@ endif() set(USE_SYSTEM_FLATBUFFERS_LIBS ${DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS} CACHE BOOL "use flatbuffers library from system") if (USE_SYSTEM_FLATBUFFERS_LIBS) - find_package(flatbuffers REQUIRED) + if (ENABLE_AMLOGIC) + find_program(FLATBUFFERS_FLATC_EXECUTABLE NAMES flatc REQUIRED) + else () + find_package(flatbuffers REQUIRED) + endif() include_directories(${FLATBUFFERS_INCLUDE_DIRS}) else () set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared flatbuffers library") @@ -41,12 +45,21 @@ message(STATUS "Using flatbuffers compiler: " ${FLATBUFFERS_FLATC_EXECUTABLE}) function(compile_flattbuffer_schema SRC_FBS OUTPUT_DIR) - string(REGEX REPLACE "\\.fbs$" "_generated.h" GEN_HEADER ${SRC_FBS}) - add_custom_command( - OUTPUT ${GEN_HEADER} - COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --no-includes --gen-mutable - --gen-object-api - -o "${OUTPUT_DIR}" - "${SRC_FBS}" - DEPENDS flatc) + string(REGEX REPLACE "\\.fbs$" "_generated.h" GEN_HEADER ${SRC_FBS}) + if (ENABLE_AMLOGIC) + add_custom_command( + OUTPUT ${GEN_HEADER} + COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --no-includes --gen-mutable + --gen-object-api + -o "${OUTPUT_DIR}" + "${SRC_FBS}") + else() + add_custom_command( + OUTPUT ${GEN_HEADER} + COMMAND "${FLATBUFFERS_FLATC_EXECUTABLE}" -c --no-includes --gen-mutable + --gen-object-api + -o "${OUTPUT_DIR}" + "${SRC_FBS}" + DEPENDS flatc) + endif() endfunction() diff --git a/include/bonjour/bonjourservicebrowser.h b/include/bonjour/bonjourservicebrowser.h index 590747fd..948fdb9f 100644 --- a/include/bonjour/bonjourservicebrowser.h +++ b/include/bonjour/bonjourservicebrowser.h @@ -30,7 +30,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define BONJOURSERVICEBROWSER_H #include +#ifndef PLATFORM_AMLOGIC #include +#else +#include +#endif #include "bonjour/bonjourrecord.h" diff --git a/include/bonjour/bonjourserviceregister.h b/include/bonjour/bonjourserviceregister.h index d0c65d87..1893e954 100755 --- a/include/bonjour/bonjourserviceregister.h +++ b/include/bonjour/bonjourserviceregister.h @@ -34,7 +34,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "bonjourrecord.h" class QSocketNotifier; +#ifndef PLATFORM_AMLOGIC #include +#else +#include +#endif class BonjourServiceRegister : public QObject { diff --git a/include/bonjour/bonjourserviceresolver.h b/include/bonjour/bonjourserviceresolver.h index 08ab3811..ed10e1ba 100644 --- a/include/bonjour/bonjourserviceresolver.h +++ b/include/bonjour/bonjourserviceresolver.h @@ -31,9 +31,11 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include - +#ifndef PLATFORM_AMLOGIC #include - +#else +#include +#endif class QSocketNotifier; class QHostInfo; class BonjourRecord; diff --git a/src/hyperion-aml/CMakeLists.txt b/src/hyperion-aml/CMakeLists.txt index 861e46bf..571077c9 100644 --- a/src/hyperion-aml/CMakeLists.txt +++ b/src/hyperion-aml/CMakeLists.txt @@ -35,6 +35,12 @@ target_link_libraries(${PROJECT_NAME} Qt5::Network ) +if (ENABLE_AMLOGIC) + target_link_libraries(${PROJECT_NAME} + pcre16 dl z + ) +endif() + install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" ) if(CMAKE_HOST_UNIX) diff --git a/src/hyperion-framebuffer/CMakeLists.txt b/src/hyperion-framebuffer/CMakeLists.txt index 808def5b..1e82137d 100644 --- a/src/hyperion-framebuffer/CMakeLists.txt +++ b/src/hyperion-framebuffer/CMakeLists.txt @@ -34,6 +34,12 @@ target_link_libraries( ${PROJECT_NAME} Qt5::Network ) +if (ENABLE_AMLOGIC) + target_link_libraries( ${PROJECT_NAME} + pcre16 dl z + ) +endif() + install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" ) if(CMAKE_HOST_UNIX) diff --git a/src/hyperion-remote/CMakeLists.txt b/src/hyperion-remote/CMakeLists.txt index 2f7cbbae..dd3f4ef0 100644 --- a/src/hyperion-remote/CMakeLists.txt +++ b/src/hyperion-remote/CMakeLists.txt @@ -29,6 +29,12 @@ target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Network) +if (ENABLE_AMLOGIC) + target_link_libraries(${PROJECT_NAME} + pcre16 dl z + ) +endif() + install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" ) if(CMAKE_HOST_UNIX) diff --git a/src/hyperion-v4l2/CMakeLists.txt b/src/hyperion-v4l2/CMakeLists.txt index 3a645236..7290cf39 100644 --- a/src/hyperion-v4l2/CMakeLists.txt +++ b/src/hyperion-v4l2/CMakeLists.txt @@ -34,6 +34,12 @@ target_link_libraries(${PROJECT_NAME} Qt5::Network ) +if (ENABLE_AMLOGIC) + target_link_libraries(${PROJECT_NAME} + pcre16 dl z + ) +endif() + install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin/" COMPONENT "${PLATFORM}" ) if(CMAKE_HOST_UNIX) diff --git a/src/hyperiond/CMakeLists.txt b/src/hyperiond/CMakeLists.txt index 6c9689f6..b755e106 100644 --- a/src/hyperiond/CMakeLists.txt +++ b/src/hyperiond/CMakeLists.txt @@ -24,6 +24,13 @@ target_link_libraries(hyperiond ${PYTHON_LIBRARIES} ) +if (ENABLE_AMLOGIC) + target_link_libraries(hyperiond + Qt5::Core + pcre16 dl z + ) +endif() + if (ENABLE_DISPMANX) IF ( "${PLATFORM}" MATCHES rpi) find_package(BCM REQUIRED)