summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>2023-01-03 10:29:12 +0700
committerTran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>2023-01-03 10:29:12 +0700
commite6a5c6fd3222f3325b68ef2f71d6e4c951f29900 (patch)
tree5e4a1b11de355b2c841a64436f928bd6736c789c
parentf6911a11dc911a5bcb380d0895db6cfd533a3569 (diff)
downloadwayland-ivi-extension-e6a5c6fd3222f3325b68ef2f71d6e4c951f29900.tar.gz
CMake: correct the pkg_config header variable
pkg_check_modules will create the include directory variable of the module. The format is: ${MODULE}_INCLUDE_DIRS. Signed-off-by: Tran Ba Khang(MS/EMC31-XC) <Khang.TranBa@vn.bosch.com>
-rw-r--r--ivi-layermanagement-api/ilmControl/CMakeLists.txt2
-rw-r--r--ivi-layermanagement-api/ilmInput/CMakeLists.txt2
-rw-r--r--ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt10
-rw-r--r--ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt2
-rw-r--r--ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt2
-rw-r--r--ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt2
-rw-r--r--ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt6
7 files changed, 13 insertions, 13 deletions
diff --git a/ivi-layermanagement-api/ilmControl/CMakeLists.txt b/ivi-layermanagement-api/ilmControl/CMakeLists.txt
index f6bc551..b0e6b22 100644
--- a/ivi-layermanagement-api/ilmControl/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmControl/CMakeLists.txt
@@ -65,7 +65,7 @@ add_custom_command(
include_directories(
include
${ILM_COMMON_INCLUDE_DIRS}
- ${WAYLAND_CLIENT_INCLUDE_DIR}
+ ${WAYLAND_CLIENT_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
)
diff --git a/ivi-layermanagement-api/ilmInput/CMakeLists.txt b/ivi-layermanagement-api/ilmInput/CMakeLists.txt
index b4c794c..f2ed324 100644
--- a/ivi-layermanagement-api/ilmInput/CMakeLists.txt
+++ b/ivi-layermanagement-api/ilmInput/CMakeLists.txt
@@ -50,7 +50,7 @@ include_directories(
include
${CMAKE_CURRENT_BINARY_DIR}
${ILM_CONTROL_INCLUDE_DIRS}
- ${WAYLAND_CLIENT_INCLUDE_DIR}
+ ${WAYLAND_CLIENT_INCLUDE_DIRS}
)
link_directories(
diff --git a/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt b/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt
index 76d8def..e8596e8 100644
--- a/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt
+++ b/ivi-layermanagement-examples/EGLWLInputEventExample/CMakeLists.txt
@@ -48,11 +48,11 @@ add_custom_command(
)
include_directories(
- ${GLESv2_INCLUDE_DIR}
- ${EGL_INCLUDE_DIR}
- ${WAYLAND_CLIENT_INCLUDE_DIR}
- ${WAYLAND_CURSOR_INCLUDE_DIR}
- ${FFI_INCLUDE_DIR}
+ ${GLESv2_INCLUDE_DIRS}
+ ${EGL_INCLUDE_DIRS}
+ ${WAYLAND_CLIENT_INCLUDE_DIRS}
+ ${WAYLAND_CURSOR_INCLUDE_DIRS}
+ ${FFI_INCLUDE_DIRS}
"include"
${CMAKE_CURRENT_BINARY_DIR}
)
diff --git a/ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt b/ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt
index aeb3269..5a01682 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt
+++ b/ivi-layermanagement-examples/LayerManagerControl/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
"${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include"
"${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmControl/include"
"${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmInput/include"
- ${WAYLAND_CLIENT_INCLUDE_DIR}
+ ${WAYLAND_CLIENT_INCLUDE_DIRS}
)
link_directories(
diff --git a/ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt b/ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt
index f846663..78db1af 100644
--- a/ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt
+++ b/ivi-layermanagement-examples/layer-add-surfaces/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
"${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include"
"${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmClient/include"
"${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmControl/include"
- ${WAYLAND_CLIENT_INCLUDE_DIR}
+ ${WAYLAND_CLIENT_INCLUDE_DIRS}
)
link_directories(
diff --git a/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt b/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt
index b9036bf..2d0acac 100644
--- a/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt
+++ b/ivi-layermanagement-examples/multi-touch-viewer/CMakeLists.txt
@@ -56,7 +56,7 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${GLESv2_INCLUDE_DIRS}
${EGL_INCLUDE_DIRS}
- ${WAYLAND_CLIENT_INCLUDE_DIR}
+ ${WAYLAND_CLIENT_INCLUDE_DIRS}
)
link_directories(
diff --git a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt
index 0c4f5df..a324c84 100644
--- a/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt
+++ b/ivi-layermanagement-examples/simple-weston-client/CMakeLists.txt
@@ -80,10 +80,10 @@ if(${LIBWESTON_PROTOCOLS_FOUND})
endif(${LIBWESTON_PROTOCOLS_FOUND})
include_directories(
- ${WAYLAND_CLIENT_INCLUDE_DIR}
- ${WAYLAND_CURSOR_INCLUDE_DIR}
+ ${WAYLAND_CLIENT_INCLUDE_DIRS}
+ ${WAYLAND_CURSOR_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
- ${DLT_INCLUDE_DIR}
+ ${DLT_INCLUDE_DIRS}
)
link_directories(