X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=597a6104497762f3685d0fc7a20b1d11ef4e65f9;hb=bdf5562f360402f810278ccbb3fdbab6b464d1c3;hp=7bbc35d36bb65653f94ec7673ca540bf325d77fc;hpb=074d058a7a483a66af7f8c0b928b321ad483f47c;p=apps%2Fagl-service-windowmanager.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7bbc35d..597a610 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,17 +23,12 @@ 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
+   wayland_ivi_wm.hpp
    util.cpp
    util.hpp
    layout.cpp
@@ -42,16 +37,17 @@ add_library(${TARGETS_WM} MODULE
    json_helper.cpp
    json_helper.hpp
    app.hpp app.cpp
-   afb_binding_api.cpp
    result.hpp
-   afb_binding_api.hpp
-   afb_binding_glue.inl
    layers.cpp
    layers.hpp
    controller_hooks.hpp
    config.cpp
    config.hpp
-   policy.hpp)
+   policy.hpp
+   wm_client.cpp
+   wm_error.cpp
+   applist.cpp
+   request.cpp)
 
 target_include_directories(${TARGETS_WM}
     PRIVATE
@@ -72,7 +68,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}
@@ -122,6 +118,8 @@ endif()
 add_custom_command(TARGET ${TARGETS_WM} POST_BUILD
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
    COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_WM}.so ${PROJECT_BINARY_DIR}/package/root/lib
+   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
 )
 
 add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root