diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:20:38 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-09 18:24:36 +0200 |
| commit | 99cef05b4c32c401868c7f487784130e607ca74c (patch) | |
| tree | 21c978e2209cddafd44e8b850eaa53dde7ed7553 /meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Added-ivi-id-agent-to-CMake.patch | |
| parent | 0f1670b4b635d54c744a3e697be169957f321808 (diff) | |
| parent | ffa9f4476251778974c77e35d924c20b29bf2792 (diff) | |
Merge remote-tracking branch 'origin/sandbox/sdesneux/thud-upgrade'
Update the core distro to YP 2.6 'thud'.
Bug-AGL: SPEC-1837
Change-Id: I5a753503c4ca15bcb0d4f0f30c4a91e7d50ab024
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Added-ivi-id-agent-to-CMake.patch')
| -rw-r--r-- | meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Added-ivi-id-agent-to-CMake.patch | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Added-ivi-id-agent-to-CMake.patch b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Added-ivi-id-agent-to-CMake.patch index feeef0e22..7ea0b6e9b 100644 --- a/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Added-ivi-id-agent-to-CMake.patch +++ b/meta-agl-profile-graphical/recipes-graphics/wayland/wayland-ivi-extension/0001-Added-ivi-id-agent-to-CMake.patch @@ -3,33 +3,20 @@ From: Michael Teyfel <mteyfel@de.adit-jv.com> Date: Fri, 12 Oct 2018 17:12:24 +0200 Subject: [PATCH 1/3] Added ivi-id-agent to CMake +Reworked for wayland-ivi-extension 2.2.0 by Scott Murray. + Signed-off-by: Michael Teyfel <mteyfel@de.adit-jv.com> ---- - CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) +Signed-off-by: Scott Murray <scott.murray@konsulko.com> diff --git a/CMakeLists.txt b/CMakeLists.txt -index c82136e..33662b9 100644 +index 7d0044a..988fc89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,6 +23,9 @@ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - - project(wayland-ivi-extension) - -+find_package(PkgConfig REQUIRED) -+pkg_check_modules(WESTON weston>=2.0.0 REQUIRED) -+ - SET(IVI_EXTENSION_VERSION 2.0.2) - SET(ILM_API_VERSION 2.0.2) - -@@ -35,6 +38,7 @@ add_subdirectory(ivi-layermanagement-api/ilmClient) - add_subdirectory(ivi-layermanagement-api/ilmControl) - add_subdirectory(ivi-layermanagement-api/test) +@@ -40,6 +40,7 @@ add_subdirectory(ivi-layermanagement-api/test) add_subdirectory(ivi-layermanagement-examples) + add_subdirectory(ivi-layermanagement-api/ilmInput) + add_subdirectory(ivi-input-modules/ivi-input-controller) +add_subdirectory(ivi-id-agent-modules/ivi-id-agent) - if(WITH_ILM_INPUT) - add_subdirectory(ivi-input-api/ilmInput) --- -2.7.4 - + + #============================================================================================= |