diff options
author | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2023-02-10 17:51:59 +0100 |
---|---|---|
committer | Eugen Friedrich <efriedrich@de.adit-jv.com> | 2023-02-10 17:51:59 +0100 |
commit | b090cb09fbf7fec9e18fc76c5ba31ac9adc76e74 (patch) | |
tree | 040c6f3f4e181810b9ad8ff26103047f4817df41 | |
parent | eec9948c9b0c9f7d348c164fa5b54b262bc79b47 (diff) | |
parent | ed18ec8b5ab1457392da32d5dccb737bd9bfc3e4 (diff) | |
download | wayland-ivi-extension-b090cb09fbf7fec9e18fc76c5ba31ac9adc76e74.tar.gz |
Merge remote-tracking branch 'upstream/pull/142'
* upstream/pull/142
CMakeLists: update libweston to version 9
Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com>
Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>
-rw-r--r-- | ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt | 2 | ||||
-rw-r--r-- | ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt index 3a1d9c6..101d773 100644 --- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt +++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) pkg_check_modules(WESTON weston>=6.0.0 REQUIRED) pkg_check_modules(PIXMAN pixman-1 REQUIRED) -pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-8 REQUIRED) +pkg_check_modules(LIBWESTON_DESKTOP libweston-desktop-9 REQUIRED) find_package(Threads REQUIRED) diff --git a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt index d3bb616..fc56304 100644 --- a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt +++ b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt @@ -22,14 +22,14 @@ project (simple-weston-client) find_package(PkgConfig) pkg_check_modules(WAYLAND_CLIENT wayland-client REQUIRED) pkg_check_modules(WAYLAND_CURSOR wayland-cursor REQUIRED) -pkg_check_modules(LIBWESTON_PROTOCOLS libweston-8-protocols QUIET) +pkg_check_modules(LIBWESTON_PROTOCOLS libweston-9-protocols QUIET) if(${LIBWESTON_PROTOCOLS_FOUND}) #check for DLT pkg_check_modules(DLT automotive-dlt QUIET) #import the pkgdatadir from libweston-protocols pkgconfig file - execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir libweston-8-protocols + execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=pkgdatadir libweston-9-protocols OUTPUT_VARIABLE WestonProtocols_PKGDATADIR) string(REGEX REPLACE "[\r\n]" "" WestonProtocols_PKGDATADIR "${WestonProtocols_PKGDATADIR}") SET(LIBWESTON_PROTOCOLS_PKGDATADIR ${WestonProtocols_PKGDATADIR}) |