diff options
| -rw-r--r-- | cmake/modules/FindWayland.cmake | 99 | ||||
| -rw-r--r-- | cmake/modules/FindWeston.cmake | 40 | ||||
| -rw-r--r-- | ivi-layermanagement-api/ilmClient/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ivi-layermanagement-api/ilmCommon/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ivi-layermanagement-api/ilmControl/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | weston-ivi-shell/CMakeLists.txt | 17 | ||||
| -rwxr-xr-x | weston-ivi-shell/src/ivi-controller.c | 4 |
8 files changed, 27 insertions, 161 deletions
diff --git a/cmake/modules/FindWayland.cmake b/cmake/modules/FindWayland.cmake deleted file mode 100644 index 5b3ae8b..0000000 --- a/cmake/modules/FindWayland.cmake +++ /dev/null @@ -1,99 +0,0 @@ -############################################################################ -# -# Copyright 2010, 2011 BMW Car IT GmbH -# Copyright (C) 2011 DENSO CORPORATION and Robert Bosch Car Multimedia Gmbh -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################ - -FIND_PATH(WAYLAND_CLIENT_INCLUDE_DIR /wayland-client.h -/usr/include /usr/local/include -) - -FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES -NAMES wayland-client -PATHS /usr/lib /usr/local/lib -) - -FIND_PATH(WAYLAND_SERVER_INCLUDE_DIR /wayland-server.h -/usr/include /usr/local/include -) - -FIND_LIBRARY(WAYLAND_SERVER_LIBRARIES -NAMES wayland-server -PATHS /usr/lib /usr/local/lib -) - -FIND_LIBRARY(WAYLAND_EGL_LIBRARIES -NAMES wayland-egl -PATHS /usr/lib /usr/local/lib -) - -FIND_PATH(FFI_INCLUDE_DIR /ffi.h -/usr/include /usr/local/include /usr/include/i386-linux-gnu -) - -FIND_LIBRARY(FFI_LIBRARIES -NAMES ffi -PATHS /usr/lib /usr/local/lib -) - -FIND_PATH(XKB_INCLUDE_DIR /xkbcommon.h -/usr/include/xkbcommon /usr/local/include/xkbcommon -) - -FIND_LIBRARY(XKB_LIBRARIES -NAMES xkbcommon -PATHS /usr/lib /usr/local/lib -) - -FIND_PATH(MTDEV_INCLUDE_DIR /mtdev.h -/usr/include /usr/local/include -) - -FIND_LIBRARY(MTDEV_LIBRARIES -NAMES mtdev -PATHS /usr/lib /usr/local/lib -) - -SET( WAYLAND_FOUND "NO" ) -IF(WAYLAND_CLIENT_LIBRARIES AND WAYLAND_SERVER_LIBRARIES) - SET( WAYLAND_FOUND "YES" ) - message(STATUS "Found Wayland-Client libs: ${WAYLAND_CLIENT_LIBRARIES}") - message(STATUS "Found Wayland-Client includes: ${WAYLAND_CLIENT_INCLUDE_DIR}") - message(STATUS "Found Wayland-Server libs: ${WAYLAND_SERVER_LIBRARIES}") - message(STATUS "Found Wayland-Server includes: ${WAYLAND_SERVER_INCLUDE_DIR}") - message(STATUS "Found Wayland-Egl libs: ${WAYLAND_EGL_LIBRARIES}") - message(STATUS "Found ffi need by Wayland libs: ${FFI_LIBRARIES}") - message(STATUS "Found ffi need by Wayland includes: ${FFI_INCLUDE_DIR}") - message(STATUS "Found xkbcommon need by Wayland libs: ${XKB_LIBRARIES}") - message(STATUS "Found xkbcommon need by Wayland includes: ${XKB_INCLUDE_DIR}") - message(STATUS "Found mtdev need by Wayland libs: ${MTDEV_LIBRARIES}") - message(STATUS "Found mtdev need by Wayland includes: ${MTDEV_INCLUDE_DIR}") -ENDIF(WAYLAND_CLIENT_LIBRARIES AND WAYLAND_SERVER_LIBRARIES) - -MARK_AS_ADVANCED( - WAYLAND_CLIENT_INCLUDE_DIR - WAYLAND_CLIENT_LIBRARIES - WAYLAND_SERVER_INCLUDE_DIR - WAYLAND_SERVER_LIBRARIES - WAYLAND_EGL_LIBRARIES - FFI_INCLUDE_DIR - FFI_LIBRARIES - XKB_LIBRARIES - XKB_INCLUDE_DIR - MTDEV_LIBRARIES - MTDEV_INCLUDE_DIR -) diff --git a/cmake/modules/FindWeston.cmake b/cmake/modules/FindWeston.cmake deleted file mode 100644 index 4ff8f5d..0000000 --- a/cmake/modules/FindWeston.cmake +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -# -# Copyright (C) 2013 DENSO CORPORATION -# -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -############################################################################ - -FIND_PATH(WESTON_INCLUDE_DIR compositor.h -/usr/include/weston -/include/weston -) - -FIND_LIBRARY(WESTON_LIBRARIES -NAMES weston-layout -PATHS /lib/weston -) - -SET( WESTON_FOUND "NO" ) -IF(WESTON_INCLUDE_DIR AND WESTON_LIBRARIES) - SET( WESTON_FOUND "YES" ) - message(STATUS "Found weston includes: ${WESTON_INCLUDE_DIR}") - message(STATUS "Found weston libs: ${WESTON_LIBRARIES}") -ENDIF(WESTON_INCLUDE_DIR AND WESTON_LIBRARIES) - -MARK_AS_ADVANCED( - WESTON_INCLUDE_DIR - WESTON_LIBRARIES -) diff --git a/ivi-layermanagement-api/ilmClient/CMakeLists.txt b/ivi-layermanagement-api/ilmClient/CMakeLists.txt index 6a5eb62..601f1a4 100644 --- a/ivi-layermanagement-api/ilmClient/CMakeLists.txt +++ b/ivi-layermanagement-api/ilmClient/CMakeLists.txt @@ -23,7 +23,9 @@ project(ilmClient) project_type(CORE) find_package(Threads) -find_package(Wayland REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(WAYLAND_CLIENT wayland-client REQUIRED) + include_directories( "include" diff --git a/ivi-layermanagement-api/ilmCommon/CMakeLists.txt b/ivi-layermanagement-api/ilmCommon/CMakeLists.txt index e3d50e0..19c98f2 100644 --- a/ivi-layermanagement-api/ilmCommon/CMakeLists.txt +++ b/ivi-layermanagement-api/ilmCommon/CMakeLists.txt @@ -24,7 +24,8 @@ project(ilmCommon) project_type(CORE) find_package(Threads) -find_package(Wayland REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) add_custom_command( OUTPUT ivi-application-client-protocol.h diff --git a/ivi-layermanagement-api/ilmControl/CMakeLists.txt b/ivi-layermanagement-api/ilmControl/CMakeLists.txt index 93b7bc9..4524b08 100644 --- a/ivi-layermanagement-api/ilmControl/CMakeLists.txt +++ b/ivi-layermanagement-api/ilmControl/CMakeLists.txt @@ -24,7 +24,8 @@ project(ilmControl) project_type(CORE) find_package(Threads) -find_package(Wayland REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(WAYLAND_CLIENT wayland-client REQUIRED) include_directories( "include" diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt b/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt index 7170e9d..3720b88 100644 --- a/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt +++ b/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt @@ -22,15 +22,16 @@ cmake_minimum_required (VERSION 2.6) project_type(EXAMPLE) -find_package(GLESv2 REQUIRED) -find_package(EGL REQUIRED) -find_package(Wayland REQUIRED) +find_package(PkgConfig) +pkg_check_modules(GLESv2 glesv2 REQUIRED) +pkg_check_modules(EGL egl REQUIRED) +pkg_check_modules(WAYLAND_EGL wayland-egl REQUIRED) +pkg_check_modules(WAYLAND_CLIENT wayland-client REQUIRED) include_directories( - ${GLESv2_INCLUDE_DIR} - ${EGL_INCLUDE_DIR} - ${WAYLAND_CLIENT_INCLUDE_DIR} - ${FFI_INCLUDE_DIR} + ${GLESv2_INCLUDE_DIRS} + ${EGL_INCLUDE_DIRS} + ${WAYLAND_CLIENT_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmControl/include" "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmClient/include" "${CMAKE_SOURCE_DIR}/ivi-layermanagement-api/ilmCommon/include" @@ -86,8 +87,7 @@ set(LIBS ${GLESv2_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES} ${WAYLAND_EGL_LIBRARIES} - ${FFI_LIBRARIES} - ${EGL_LIBRARY} + ${EGL_LIBRARIES} LayerManagerUtils ilmClient ilmControl diff --git a/weston-ivi-shell/CMakeLists.txt b/weston-ivi-shell/CMakeLists.txt index 63fd35f..e071747 100644 --- a/weston-ivi-shell/CMakeLists.txt +++ b/weston-ivi-shell/CMakeLists.txt @@ -22,10 +22,11 @@ cmake_minimum_required (VERSION 2.6) project(ivi-controller) project_type(CORE) -find_package(Cairo REQUIRED) -find_package(Wayland REQUIRED) -find_package(Weston REQUIRED) -find_package(Pixman REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(WAYLAND_SERVER wayland-server REQUIRED) +pkg_check_modules(CAIRO cairo REQUIRED) +pkg_check_modules(WESTON weston REQUIRED) +pkg_check_modules(PIXMAN pixman-1 REQUIRED) add_custom_command( OUTPUT ivi-application-server-protocol.h @@ -54,10 +55,10 @@ add_custom_target( include_directories( "include" - ${WAYLAND_SERVER_INCLUDE_DIR} - ${CAIRO_INCLUDE_DIR} - ${WESTON_INCLUDE_DIR} - ${PIXMAN_INCLUDE_DIR} + ${WAYLAND_SERVER_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ${WESTON_INCLUDE_DIRS} + ${PIXMAN_INCLUDE_DIRS} ) diff --git a/weston-ivi-shell/src/ivi-controller.c b/weston-ivi-shell/src/ivi-controller.c index b35deb9..cd64600 100755 --- a/weston-ivi-shell/src/ivi-controller.c +++ b/weston-ivi-shell/src/ivi-controller.c @@ -28,9 +28,9 @@ #include <linux/input.h> #include <cairo.h> -#include "compositor.h" +#include "weston/compositor.h" #include "ivi-controller-server-protocol.h" -#include "weston-layout.h" +#include "weston/weston-layout.h" struct ivishell; struct ivilayer; |