Merge remote-tracking branch 'upstream/pull/135'

* upstream/pull/135
  ivi-id-agent-modules: missing linker directory include for libweston-desktop
  CMake: Fix weston header link
  CMake: correct the pkg_config header variable

  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>

11 files changed, 17 insertions, 16 deletions

diff --git a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt
index 3e604a5..d4fc24c 100644
--- a/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt
+++ b/ivi-id-agent-modules/ivi-id-agent/CMakeLists.txt
@@ -39,6 +39,7 @@ include_directories(
 link_directories(
     ${WAYLAND_SERVER_LIBRARY_DIRS}
     ${PIXMAN_LIBRARY_DIRS}
+    ${LIBWESTON_DESKTOP_LIBRARY_DIRS}
 )
 
 
diff --git a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
index 8f0c199..227e739 100644
--- a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
+++ b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
@@ -28,7 +28,7 @@
 #include <weston.h>
 #include <libweston-6/libweston-desktop.h>
 #include "config-parser.h"
-#include <weston/ivi-layout-export.h>
+#include <ivi-layout-export.h>
 
 #ifndef INVALID_ID
 #define INVALID_ID 0xFFFFFFFF
diff --git a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c
index b4d54d1..52fc6ab 100644
--- a/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c
+++ b/ivi-input-modules/ivi-input-controller/src/ivi-input-controller.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include <weston.h>
-#include <weston/ivi-layout-export.h>
+#include <ivi-layout-export.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
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(
diff --git a/weston-ivi-shell/src/ivi-controller.h b/weston-ivi-shell/src/ivi-controller.h
index 00f5910..16dbe57 100644
--- a/weston-ivi-shell/src/ivi-controller.h
+++ b/weston-ivi-shell/src/ivi-controller.h
@@ -24,7 +24,7 @@
 #define WESTON_IVI_SHELL_SRC_IVI_CONTROLLER_H_
 
 #include "ivi-wm-server-protocol.h"
-#include <weston/ivi-layout-export.h>
+#include <ivi-layout-export.h>
 
 /* Convert timespec to milliseconds
  *