Code Review
/
apps
/
agl-service-windowmanager-2017.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug Fix: Window Manager doesn't react after killing app process
[apps/agl-service-windowmanager-2017.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
746fb93
..
f727500
100644
(file)
--- 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.
#
# 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.
#
# limitations under the License.
#
-wlproto(IVI_CON ivi-
controller
)
+wlproto(IVI_CON ivi-
wm
)
include(FindPkgConfig)
pkg_check_modules(AFB REQUIRED afb-daemon)
include(FindPkgConfig)
pkg_check_modules(AFB REQUIRED afb-daemon)
@@
-23,35
+23,17
@@
pkg_check_modules(SD REQUIRED libsystemd>=222)
# We do not want a prefix for our module
set(CMAKE_SHARED_MODULE_PREFIX "")
# 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
set(TARGETS_WM windowmanager-service)
add_library(${TARGETS_WM} MODULE
main.cpp
- wayland.cpp
- wayland.hpp
+ wayland_ivi_wm.cpp
util.cpp
util.cpp
- util.hpp
layout.cpp
layout.cpp
- layout.hpp
${IVI_CON_PROTO}
json_helper.cpp
${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
- layers.cpp
- layers.hpp
- controller_hooks.hpp
- config.cpp
- config.hpp
- policy.hpp)
+ app.cpp
+ layers.cpp)
target_include_directories(${TARGETS_WM}
PRIVATE
target_include_directories(${TARGETS_WM}
PRIVATE
@@
-72,7
+54,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}"
# 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}
if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Release")
target_compile_definitions(${TARGETS_WM}