X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=47d4bf8b97ed2ec21c11ca763a9b58b7604b3106;hb=be9cbe2c4d0bc0f65cbe08de2bad3eb6e7f248c0;hp=746fb9351ef87126cf072de9da083a3d3938c691;hpb=11a7e61c482d46b63da1b90ea4f341460f71b48b;p=apps%2Fagl-service-windowmanager.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 746fb93..47d4bf8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH +# Copyright (c) 2017 TOYOTA MOTOR CORPORATION # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ # limitations under the License. # -wlproto(IVI_CON ivi-controller) +wlproto(IVI_CON ivi-wm) include(FindPkgConfig) pkg_check_modules(AFB REQUIRED afb-daemon) @@ -23,35 +23,18 @@ pkg_check_modules(SD REQUIRED libsystemd>=222) # We do not want a prefix for our module set(CMAKE_SHARED_MODULE_PREFIX "") -add_custom_command( - OUTPUT afb_binding_api.hpp afb_binding_glue.inl - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../generate-binding-glue.py - COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/../generate-binding-glue.py) - set(TARGETS_WM windowmanager-service) add_library(${TARGETS_WM} MODULE main.cpp - wayland.cpp - wayland.hpp + wayland_ivi_wm.cpp util.cpp - util.hpp layout.cpp - layout.hpp ${IVI_CON_PROTO} json_helper.cpp - json_helper.hpp - app.hpp app.cpp - afb_binding_api.cpp - result.hpp - afb_binding_api.hpp - afb_binding_glue.inl + app.cpp layers.cpp - layers.hpp - controller_hooks.hpp - config.cpp - config.hpp - policy.hpp) + config.cpp) target_include_directories(${TARGETS_WM} PRIVATE @@ -72,7 +55,7 @@ target_compile_definitions(${TARGETS_WM} # We do not want source location of messages AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS WINMAN_VERSION_STRING="${PACKAGE_VERSION}" - _GNU_SOURCE) # XXX should I define this here?! + _GNU_SOURCE) if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Release") target_compile_definitions(${TARGETS_WM}