From: Loïc Collignon Date: Mon, 9 Jul 2018 15:04:57 +0000 (+0200) Subject: Fix compilation and deployment X-Git-Tag: 5.99.2~1 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=6ac46af41abf9f201ecfb87b554b7e45e33bce16;hp=bc11d604c87c2a04406e0750106e17a5c32f2e27;p=apps%2Fmixer.git Fix compilation and deployment Add CMake definitions so that it use the correct API's version. XML node in config.xml wasn't correct so that it fails to parse. The binary should be placed into a bin sub-directory. Add the missing API import. Fix the dependency name due to renaming. Hack the compilation script so that it can find the widget when yocto and when jenkins (waiting for a fix of the cmake alias in the SDK so that I can get rid of this script) Change-Id: Idaff67d8d63b7163deb16766832cf04349eb0237 Signed-off-by: Loïc Collignon --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 37683ee..e20b475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.3) set(AFB_HELPERS_QTWSCLIENT ON CACHE BOOL "enable Qt's WebSocket client" FORCE) -add_definitions(-DUSE_API_DYN) +add_definitions(-DUSE_API_DYN -DAFB_BINDING_WANT_DYNAPI -DAFB_BINDING_VERSION=3) include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index abbc03b..d23c33a 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -59,6 +59,6 @@ target_link_libraries(mixer if(NOT NATIVE_BUILD) target_link_libraries(mixer homescreen - qtWindowmanager + qtwindowmanager ) endif() diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild index ea352e7..883293d 100755 --- a/conf.d/autobuild/agl/autobuild +++ b/conf.d/autobuild/agl/autobuild @@ -15,6 +15,7 @@ pushd $BUILD_DIR if [ "$1" == "package" ]; then make widget + cp *.wgt package/ fi popd diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in index 597f19d..6f27215 100644 --- a/conf.d/wgt/config.xml.in +++ b/conf.d/wgt/config.xml.in @@ -2,17 +2,17 @@ @PROJECT_NAME@ - + @PROJECT_DESCRIPTION@ - - - Loïc Collignon <loic.collignon@iot.bzh> - Matt Porter <mporter@konsulko.com> - + + Loïc Collignon <loic.collignon@iot.bzh> + Matt Porter <mporter@konsulko.com> + @PROJECT_LICENSE@ +