Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Start to rework using ilmControl
[apps/agl-service-windowmanager.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
b1597b7
..
6ac3022
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-14,10
+14,9
@@
# limitations under the License.
#
# limitations under the License.
#
-wlproto(IVI_CON ivi-wm)
-
include(FindPkgConfig)
pkg_check_modules(AFB REQUIRED afb-daemon)
include(FindPkgConfig)
pkg_check_modules(AFB REQUIRED afb-daemon)
+pkg_check_modules(ILM REQUIRED ilmControl ilmCommon)
pkg_check_modules(SD REQUIRED libsystemd>=222)
# We do not want a prefix for our module
pkg_check_modules(SD REQUIRED libsystemd>=222)
# We do not want a prefix for our module
@@
-27,25
+26,22
@@
set(TARGETS_WM windowmanager-service)
add_library(${TARGETS_WM} MODULE
main.cpp
add_library(${TARGETS_WM} MODULE
main.cpp
- wayland_ivi_wm.cpp
util.cpp
util.cpp
- layout.cpp
- ${IVI_CON_PROTO}
json_helper.cpp
json_helper.cpp
- window_manager.cpp
- layers.cpp
- wm_client.cpp
- wm_error.cpp
applist.cpp
request.cpp
pm_wrapper.cpp
applist.cpp
request.cpp
pm_wrapper.cpp
+ window_manager.cpp
+ wm_client.cpp
+ wm_error.cpp
wm_layer.cpp
wm_layer.cpp
-
layout_manager
.cpp)
+
wm_layer_control
.cpp)
target_include_directories(${TARGETS_WM}
PRIVATE
${AFB_INCLUDE_DIRS}
${SD_INCLUDE_DIRS}
target_include_directories(${TARGETS_WM}
PRIVATE
${AFB_INCLUDE_DIRS}
${SD_INCLUDE_DIRS}
+ ${ILM_INCLUDE_DIRS}
../include
../src
../${PLUGIN_PM})
../include
../src
../${PLUGIN_PM})
@@
-54,6
+50,7
@@
target_link_libraries(${TARGETS_WM}
PRIVATE
${AFB_LIBRARIES}
${WLC_LIBRARIES}
PRIVATE
${AFB_LIBRARIES}
${WLC_LIBRARIES}
+ ${ILM_LIBRARIES}
${SD_LIBRARIES}
${PLUGIN_PM})
${SD_LIBRARIES}
${PLUGIN_PM})