diff options
| author |   Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2015-11-16 21:44:40 +0900 |
|---|---|---|
| committer | Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> | 2015-11-16 21:44:40 +0900 |
| commit | b9def0a12bd95a62dffed4536deb0d9c7ee5d7da (patch) | |
| tree | 09794fa6c19ddd6c040a5298d1684a6224114a69 /meta-ivi-common/recipes-automotive | |
| parent | 1cabebe572defd64c998c484b623d8d7ad31b93e (diff) | |
Fix build issues while bitbake without meta-qt5
Change-Id: I628f4b165b650bd570f7928987508f0d8a55ab26
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-ivi-common/recipes-automotive')
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0001-Fix-build-issues-while-bitbake-without-meta-qt5-laye.patch b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0001-Fix-build-issues-while-bitbake-without-meta-qt5-laye.patch new file mode 100644 index 000000000..5e77f6ab4 --- /dev/null +++ b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0001-Fix-build-issues-while-bitbake-without-meta-qt5-laye.patch @@ -0,0 +1,30 @@ +From aff92c907e8fc96b1edf96aa061843bce71244ca Mon Sep 17 00:00:00 2001 +From: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> +Date: Mon, 16 Nov 2015 20:22:06 +0900 +Subject: [PATCH] Fix build issues while bitbake without meta-qt5 layer + +Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com> +--- + tests/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index cea4807..900bdc5 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -11,6 +11,7 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gendb.sh ${CMAKE_CURRENT_SOURCE_DIR} + + install (PROGRAMS ${amb_tests} DESTINATION bin) + ++if(qtmainloop OR qt_bindings) + find_package(Qt5Network) + find_package(Qt5Core) + +@@ -28,3 +29,4 @@ if(Qt5Network_FOUND) + add_executable(testProtocolClient testProtocolClient.cpp testProtocolCommon.h) + target_link_libraries(testProtocolClient ${link_libraries} amb -L${CMAKE_CURRENT_BINARY_DIR}/lib amb-plugins-common amb-json-protocol -L${CMAKE_CURRENT_BINARY_DIR}/plugins/common ${QT_LIBRARIES}) + endif() ++endif(qtmainloop OR qt_bindings) +-- +1.9.1 + diff --git a/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb index ce4b12770..06926e985 100644 --- a/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb +++ b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker_git.bb @@ -38,6 +38,7 @@ SRC_URI += " \ file://0007-WORKAROUND-Allow-amb-qt-binding-to-work-in-case-of-m.patch \ file://0008-Add-simple-Qt-QML-example.patch \ file://0009-Add-Pressure-property-to-BrakeOperation.patch \ + file://0001-Fix-build-issues-while-bitbake-without-meta-qt5-laye.patch \ file://ambd.service \ " |