diff options
author | Timo Lotterbach <timo.lotterbach@bmw-carit.de> | 2014-01-31 15:59:02 +0100 |
---|---|---|
committer | Timo Lotterbach <timo.lotterbach@bmw-carit.de> | 2014-01-31 15:59:02 +0100 |
commit | cdb466a9964496fb23cb014df82b2db3cd75c185 (patch) | |
tree | c4eb1a0f49f4b3696784a1dbbf8ce4dfc19dd923 /ivi-layermanagement-examples | |
parent | 2f5d78a15960957ba8cdea0fa217c1b488012bfc (diff) | |
download | wayland-ivi-extension-cdb466a9964496fb23cb014df82b2db3cd75c185.tar.gz |
added ivi-extension-protocol library
this library takes care to generate header and source files
from XML files.
All generated files are now stored in the build directory.
ilmCommon and weston-ivi-shell now just use the new library and
don't care about code generation any more.
In addition, a lot of duplicated code compilation is removed, resulting
in faster builds.
This patch also fixes an issue, that file generation was done every
time a build was started. This resulted in full rebuilds all the time.
Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>
Diffstat (limited to 'ivi-layermanagement-examples')
-rw-r--r-- | ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt | 93 |
1 files changed, 49 insertions, 44 deletions
diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt b/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt index 7d0ea43..d184506 100644 --- a/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt +++ b/ivi-layermanagement-examples/EGLWLMockNavigation/CMakeLists.txt @@ -1,6 +1,6 @@ ############################################################################ # -# Copyright 2010-2012 BMW Car IT GmbH +# Copyright 2010-2014 BMW Car IT GmbH # Copyright (C) 2011 DENSO CORPORATION and Robert Bosch Car Multimedia Gmbh # # @@ -20,77 +20,82 @@ cmake_minimum_required (VERSION 2.6) +project(EGLWLMockNavigation) + 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) +GET_TARGET_PROPERTY(ILM_CLIENT_INCLUDE_DIRS ilmClient INCLUDE_DIRECTORIES) +GET_TARGET_PROPERTY(ILM_CONTROL_INCLUDE_DIRS ilmControl INCLUDE_DIRECTORIES) + include_directories( + include + ${ILM_CLIENT_INCLUDE_DIRS} + ${ILM_CONTROL_INCLUDE_DIRS} ${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" - "include" ) set (HEADER_FILES - - include/Camera.h - include/Car.h + include/Camera.h + include/Car.h include/Argument.h - include/OpenGLES2App.h - include/Ground.h - include/House.h - include/IRenderable.h - include/IUpdateable.h - include/MockNavi.h - include/Street.h - include/ShaderBase.h - include/ShaderLighting.h + include/OpenGLES2App.h + include/Ground.h + include/House.h + include/IRenderable.h + include/IUpdateable.h + include/MockNavi.h + include/Street.h + include/ShaderBase.h + include/ShaderLighting.h ) set (SRC_FILES - - src/Camera.cpp - src/Car.cpp + src/Camera.cpp + src/Car.cpp src/Argument.cpp - src/OpenGLES2App.cpp - src/Ground.cpp - src/House.cpp - src/MockNavi.cpp - src/Street.cpp - src/ShaderBase.cpp - src/ShaderLighting.cpp - src/main.cpp - src/WaylandServerinfoProtocol.cpp - src/IlmMatrix.cpp + src/OpenGLES2App.cpp + src/Ground.cpp + src/House.cpp + src/MockNavi.cpp + src/Street.cpp + src/ShaderBase.cpp + src/ShaderLighting.cpp + src/main.cpp + src/WaylandServerinfoProtocol.cpp + src/IlmMatrix.cpp ) -add_executable(EGLWLMockNavigation +add_executable(${PROJECT_NAME} ${SRC_FILES} ${HEADER_FILES} ) -add_dependencies(EGLWLMockNavigation - ilmCommon + +set(LIBS + ${LIBS} + ${GLESv2_LIBRARIES} + ${WAYLAND_CLIENT_LIBRARIES} + ${WAYLAND_EGL_LIBRARIES} + ${EGL_LIBRARIES} ilmClient ilmControl - wayland-client ) -set(LIBS - ${LIBS} - ${GLESv2_LIBRARIES} - ${WAYLAND_CLIENT_LIBRARIES} - ${WAYLAND_EGL_LIBRARIES} - ${EGL_LIBRARIES} - ilmClient - ilmControl +add_dependencies(${PROJECT_NAME} + ${LIBS} ) -target_link_libraries(EGLWLMockNavigation ${LIBS} -ldl) +target_link_libraries(${PROJECT_NAME} + ${LIBS} +) -install (TARGETS EGLWLMockNavigation DESTINATION bin) +install( + TARGETS ${PROJECT_NAME} + DESTINATION bin +) |