Update to use CMake app template

Rework CMake files to actually use the CMake app template macros,
with an update of the autobuild script to fix test widget building
to match the state of the other bindings.

Bug-AGL: SPEC-2049

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I88c438ed4dafd631646769d7b6dc3debd1ccd6de

9 files changed, 564 insertions, 129 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a69a43..98f77f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+# Copyright (C) 2020 Konsulko Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,24 +15,13 @@
 # limitations under the License.
 #
 
-cmake_minimum_required(VERSION 2.8)
-
 project(WindowManagerTMC)
 
-set(PACKAGE_VERSION_MAJOR 0)
-set(PACKAGE_VERSION_MINOR 0)
-set(PACKAGE_VERSION_REVISION 1)
-set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_REVISION}")
-
-find_package(PkgConfig REQUIRED)
-include(GNUInstallDirs)
-
-set(SANITIZER_MODE "none" CACHE STRING "Build using a specific sanitizer (e.g. 'address', 'thread', 'leak', 'undefined'), depends on compiler; default none")
-
-set(LINK_LIBCXX OFF CACHE BOOL "Link against LLVMs libc++")
+CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 
 # Add PolicyManager as plugin
 set(PLUGIN_PM policy_manager)
-add_subdirectory(${PLUGIN_PM})
 
-add_subdirectory(src)
+set(SANITIZER_MODE "none" CACHE STRING "Build using a specific sanitizer (e.g. 'address', 'thread', 'leak', 'undefined'), depends on compiler; default none")
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake)
diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
index 994ca4b..7816b3d 100755
--- a/autobuild/agl/autobuild
+++ b/autobuild/agl/autobuild
@@ -23,7 +23,7 @@ BUILD_DIR_DEBUG_TEST := $(abspath $(dir $(THISFILE))/../../build-debug-test)
 BUILD_DIR_COVERAGE_TEST := $(abspath $(dir $(THISFILE))/../../build-coverage-test)
 DEST      := ${BUILD_DIR}
 
-.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-test build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all
+.PHONY: all clean distclean configure build package help update configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-debug-test package-coverage-test package-all
 all: help
 
 help:
@@ -95,6 +95,7 @@ package-test: build-test
 	@mkdir -p ${BUILD_DIR_TEST}/$@/htdocs
 	@mkdir -p ${BUILD_DIR_TEST}/$@/var
 	@cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target widget
+	@cmake --build ${BUILD_DIR_TEST} ${PACKAGE_ARGS} --target test_widget
 	@if [ "${DEST}" != "${BUILD_DIR_TEST}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/*.wgt ${DEST}; \
 	fi
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
new file mode 100644
index 0000000..1f5a5f2
--- /dev/null
+++ b/conf.d/cmake/config.cmake
@@ -0,0 +1,207 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+# Copyright (C) 2020 Konsulko Group
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+# Project Info
+# ------------------
+set(PROJECT_NAME "windowmanager-service")
+set(API_NAME "windowmanager")
+set(PROJECT_PRETTY_NAME "Window Manager")
+set(PROJECT_DESCRIPTION "Window Manager Service")
+set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/apps/agl-service-windowmanager")
+set(PROJECT_ICON "icon.svg")
+set(PROJECT_AUTHOR "TOYOTA")
+set(PROJECT_AUTHOR_EMAIL "")
+set(PROJECT_VERSION "0.1")
+set(PROJECT_LICENSE "APL2.0")
+set(PROJECT_LANGUAGES,"CXX")
+
+# Which directories inspect to find CMakeLists.txt target files
+# set(PROJECT_SRC_DIR_PATTERN "*")
+
+# Where are stored the project configuration files
+# relative to the root project directory
+set(PROJECT_CMAKE_CONF_DIR "conf.d")
+
+# Compilation Mode (DEBUG, RELEASE, COVERAGE or PROFILING)
+# ----------------------------------
+set(BUILD_TYPE "RELEASE")
+#set(USE_EFENCE 1)
+
+# Kernel selection if needed. You can choose between a
+# mandatory version to impose a minimal version.
+# Or check Kernel minimal version and just print a Warning
+# about missing features and define a preprocessor variable
+# to be used as preprocessor condition in code to disable
+# incompatibles features. Preprocessor define is named
+# KERNEL_MINIMAL_VERSION_OK.
+#
+# NOTE*** FOR NOW IT CHECKS KERNEL Yocto environment and
+# Yocto SDK Kernel version.
+# -----------------------------------------------
+#set (kernel_mandatory_version 4.8)
+#set (kernel_minimal_version 4.8)
+
+# Compiler selection if needed. Impose a minimal version.
+# -----------------------------------------------
+set (gcc_minimal_version 4.9)
+
+# PKG_CONFIG required packages
+# -----------------------------
+set (PKG_REQUIRED_LIST
+	json-c
+	afb-daemon
+	ilmControl
+	ilmCommon
+)
+
+# You can also consider to include libsystemd
+# -----------------------------------
+list (APPEND PKG_REQUIRED_LIST libsystemd>=222)
+
+# Prefix path where will be installed the files
+# Default: /usr/local (need root permission to write in)
+# ------------------------------------------------------
+#set(INSTALL_PREFIX /opt/AGL CACHE PATH "INSTALL PREFIX PATH")
+
+# Customize link option
+# -----------------------------
+list (APPEND link_libraries -pthread)
+
+# Compilation options definition
+# Use CMake generator expressions to specify only for a specific language
+# Values are prefilled with default options that is currently used.
+# Either separate options with ";", or each options must be quoted separately
+# DO NOT PUT ALL OPTION QUOTED AT ONCE , COMPILATION COULD FAILED !
+# ----------------------------------------------------------------------------
+#set(COMPILE_OPTIONS
+# -Wall
+# -Wextra
+# -Wconversion
+# -Wno-unused-parameter
+# -Wno-sign-compare
+# -Wno-sign-conversion
+# -Werror=maybe-uninitialized
+# -Werror=implicit-function-declaration
+# -ffunction-sections
+# -fdata-sections
+# -fPIC
+# CACHE STRING "Compilation flags")
+#set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.")
+#set(CXX_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C++ language.")
+#set(PROFILING_COMPILE_OPTIONS
+# -g
+# -O0
+# -pg
+# -Wp,-U_FORTIFY_SOURCE
+# CACHE STRING "Compilation flags for PROFILING build type.")
+#set(DEBUG_COMPILE_OPTIONS
+# -g
+# -ggdb
+# CACHE STRING "Compilation flags for DEBUG build type.")
+#set(COVERAGE_COMPILE_OPTIONS
+# -g
+# -O0
+# --coverage
+# CACHE STRING "Compilation flags for COVERAGE build type.")
+#set(RELEASE_COMPILE_OPTIONS
+# -O2
+# -pipe
+# -D_FORTIFY_SOURCE=2
+# -fstack-protector-strong
+# -Wformat -Wformat-security
+# -Werror=format-security
+# -feliminate-unused-debug-types
+# -Wl,-O1
+# -Wl,--hash-style=gnu
+# -Wl,--as-needed
+# -fstack-protector-strong
+# -Wl,-z,relro,-z,now
+# CACHE STRING "Compilation flags for RELEASE build type.")
+
+# Location for config.xml.in template file.
+#
+# If you keep them commented then it will build with a default minimal widget
+# template which is very simple and it is highly probable that it will not suit
+# to your app.
+# -----------------------------------------
+set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
+
+# Mandatory widget Mimetype specification of the main unit
+# --------------------------------------------------------------------------
+# Choose between :
+#- text/html : HTML application,
+#	content.src designates the home page of the application
+#
+#- application/vnd.agl.native : AGL compatible native,
+#	content.src designates the relative path of the binary.
+#
+# - application/vnd.agl.service: AGL service, content.src is not used.
+#
+#- ***application/x-executable***: Native application,
+#	content.src designates the relative path of the binary.
+#	For such application, only security setup is made.
+#
+set(WIDGET_TYPE application/vnd.agl.service)
+
+# Mandatory Widget entry point file of the main unit
+# --------------------------------------------------------------
+# This is the file that will be executed, loaded,
+# at launch time by the application framework.
+#
+set(WIDGET_ENTRY_POINT lib/windowmanager-service.so)
+
+# Optional dependencies order
+# ---------------------------
+#set(EXTRA_DEPENDENCIES_ORDER)
+
+# Optional Extra global include path
+# -----------------------------------
+#set(EXTRA_INCLUDE_DIRS)
+
+# Optional extra libraries
+# -------------------------
+#set(EXTRA_LINK_LIBRARIES)
+
+# Optional force binding Linking flag
+# ------------------------------------
+# set(BINDINGS_LINK_FLAG LinkOptions )
+
+# Optional force package prefix generation, like widget
+# -----------------------------------------------------
+# set(PKG_PREFIX DestinationPath)
+
+# Optional Application Framework security token
+# and port use for remote debugging.
+#------------------------------------------------------------
+set(AFB_TOKEN   ""     CACHE PATH "Default binder security token")
+set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port")
+
+# Print a helper message when every thing is finished
+# ----------------------------------------------------
+set(CLOSING_MESSAGE "Typical binding launch: cd ${CMAKE_BINARY_DIR}/package \\&\\& afb-daemon --port=${AFB_REMPORT} --workdir=. --ldpaths=lib --roothttp=htdocs  --token=\"${AFB_TOKEN}\" --tracereq=common --verbose")
+set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
+
+# Optional schema validator about now only XML, LUA and JSON
+# are supported
+#------------------------------------------------------------
+#set(LUA_CHECKER "luac" "-p" CACHE STRING "LUA compiler")
+#set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
+#set(JSON_CHECKER "json_verify" CACHE STRING "JSON linter")
+
+include(CMakeAfbTemplates)
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
new file mode 100644
index 0000000..1c5c24b
--- /dev/null
+++ b/conf.d/wgt/config.xml.in
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns="http://www.w3.org/ns/widgets" id="@PROJECT_NAME@" version="@PROJECT_VERSION@">
+	<name>@PROJECT_NAME@</name>
+	<icon src="@PROJECT_ICON@"/>
+	<content src="@WIDGET_ENTRY_POINT@" type="@WIDGET_TYPE@"/>
+	<description>@PROJECT_DESCRIPTION@</description>
+	<author>@PROJECT_AUTHOR@ &lt;@PROJECT_AUTHOR_MAIL@&gt;</author>
+	<license>@PROJECT_LICENSE@</license>
+
+	<feature name="urn:AGL:widget:required-permission">
+		<param name="urn:AGL:permission::public:hidden" value="required" />
+		<param name="urn:AGL:permission::system:run-by-default" value="required" />
+		<param name="urn:AGL:permission::public:display" value="required" />
+	</feature>
+
+	<feature name="urn:AGL:widget:provided-api">
+		<param name="@API_NAME@" value="ws" />
+	</feature>
+
+	<feature name="urn:AGL:widget:required-binding">
+		<param name="@WIDGET_ENTRY_POINT@" value="local" />
+	</feature>
+</widget>
diff --git a/conf.d/wgt/icon.svg b/conf.d/wgt/icon.svg
new file mode 100644
index 0000000..6628784
--- /dev/null
+++ b/conf.d/wgt/icon.svg
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:i="&amp;ns_ai;"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 320 320"
+   style="enable-background:new 0 0 320 320;"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="icon.svg"><metadata
+     id="metadata1292"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs1290" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1464"
+     id="namedview1288"
+     showgrid="false"
+     inkscape:zoom="0.7375"
+     inkscape:cx="-697.62712"
+     inkscape:cy="160"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><style
+     type="text/css"
+     id="style4">
+	.st0{display:none;}
+	.st1{display:inline;}
+	.st2{opacity:0.4;fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:#FFFFFF;}
+	.st5{font-family:'Roboto-Regular';}
+	.st6{font-size:25px;}
+	.st7{letter-spacing:6;}
+	.st8{fill:url(#SVGID_3_);}
+	.st9{fill:url(#SVGID_4_);}
+	.st10{fill:url(#SVGID_5_);}
+	.st11{fill:url(#SVGID_6_);}
+	.st12{fill:url(#SVGID_7_);}
+	.st13{fill:url(#SVGID_8_);}
+	.st14{fill:url(#SVGID_9_);}
+	.st15{fill:url(#SVGID_10_);}
+	.st16{fill:url(#SVGID_11_);}
+	.st17{fill:url(#SVGID_12_);}
+	.st18{fill:url(#SVGID_13_);}
+	.st19{fill:url(#SVGID_14_);}
+	.st20{fill:url(#SVGID_15_);}
+	.st21{fill:url(#SVGID_16_);}
+	.st22{fill:url(#SVGID_17_);}
+	.st23{fill:url(#SVGID_18_);}
+	.st24{opacity:0.29;}
+	.st25{fill:url(#SVGID_19_);}
+	.st26{fill:url(#SVGID_20_);}
+	.st27{fill:url(#SVGID_21_);}
+	.st28{fill:url(#SVGID_22_);}
+	.st29{fill:url(#SVGID_23_);}
+	.st30{fill:url(#SVGID_24_);}
+	.st31{fill:url(#SVGID_25_);}
+	.st32{fill:url(#SVGID_26_);}
+	.st33{fill:url(#SVGID_27_);}
+	.st34{fill:url(#SVGID_28_);}
+	.st35{fill:url(#SVGID_29_);}
+	.st36{fill:url(#SVGID_30_);}
+	.st37{fill:url(#SVGID_31_);}
+	.st38{fill:url(#SVGID_32_);}
+	.st39{fill:url(#SVGID_33_);}
+	.st40{fill:url(#SVGID_34_);}
+	.st41{fill:url(#SVGID_35_);}
+	.st42{fill:url(#SVGID_36_);}
+	.st43{opacity:0.4;fill:url(#SVGID_37_);}
+	.st44{fill:url(#SVGID_38_);}
+	.st45{fill:url(#SVGID_39_);}
+	.st46{fill:url(#SVGID_40_);}
+	.st47{fill:url(#SVGID_41_);}
+	.st48{fill:url(#SVGID_42_);}
+	.st49{fill:url(#SVGID_43_);}
+	.st50{fill:url(#SVGID_44_);}
+	.st51{display:inline;opacity:0.29;}
+	.st52{display:inline;fill:url(#SVGID_45_);}
+	.st53{display:inline;fill:url(#SVGID_46_);}
+	.st54{display:inline;fill:#FFFFFF;}
+	.st55{display:inline;fill:url(#SVGID_47_);}
+	.st56{display:inline;fill:url(#SVGID_48_);}
+	.st57{display:inline;fill:url(#SVGID_49_);}
+	.st58{display:inline;fill:url(#SVGID_50_);}
+	.st59{display:inline;fill:url(#SVGID_51_);}
+	.st60{display:inline;fill:url(#SVGID_52_);}
+	.st61{opacity:0.4;fill:url(#SVGID_53_);}
+	.st62{fill:url(#SVGID_54_);}
+	.st63{fill:url(#SVGID_55_);}
+	.st64{fill:url(#SVGID_56_);}
+	.st65{fill:url(#SVGID_57_);}
+	.st66{fill:url(#SVGID_58_);}
+	.st67{opacity:0.4;fill:url(#SVGID_59_);}
+	.st68{fill:url(#SVGID_60_);}
+	.st69{fill:url(#SVGID_61_);}
+	.st70{fill:url(#SVGID_62_);}
+	.st71{fill:url(#SVGID_63_);}
+	.st72{fill:url(#SVGID_64_);}
+	.st73{fill:url(#SVGID_65_);}
+	.st74{fill:url(#SVGID_66_);}
+	.st75{fill:url(#SVGID_67_);}
+	.st76{fill:url(#SVGID_68_);}
+	.st77{fill:url(#SVGID_69_);}
+	.st78{fill:url(#SVGID_70_);}
+	.st79{fill:url(#SVGID_71_);}
+	.st80{fill:url(#SVGID_72_);}
+	.st81{fill:url(#SVGID_73_);}
+	.st82{fill:url(#SVGID_74_);}
+	.st83{fill:url(#SVGID_75_);}
+	.st84{fill:url(#SVGID_76_);}
+	.st85{fill:url(#SVGID_77_);}
+	.st86{fill:url(#SVGID_78_);}
+	.st87{fill:url(#SVGID_79_);}
+	.st88{fill:url(#SVGID_80_);}
+	.st89{fill:url(#SVGID_81_);}
+	.st90{fill:url(#SVGID_82_);}
+	.st91{fill:url(#SVGID_83_);}
+	.st92{fill:url(#SVGID_84_);}
+	.st93{fill:url(#SVGID_85_);}
+	.st94{fill:url(#SVGID_86_);}
+	.st95{opacity:0.4;fill:url(#SVGID_87_);}
+	.st96{fill:url(#SVGID_88_);}
+	.st97{fill:url(#SVGID_89_);}
+	.st98{fill:url(#SVGID_90_);}
+	.st99{display:inline;fill:url(#SVGID_91_);}
+	.st100{display:inline;fill:url(#SVGID_92_);}
+	.st101{fill:url(#SVGID_93_);}
+	.st102{fill:url(#SVGID_94_);}
+	.st103{opacity:0.4;fill:url(#SVGID_95_);}
+	.st104{fill:url(#SVGID_96_);}
+	.st105{fill:url(#SVGID_97_);}
+	.st106{fill:url(#SVGID_98_);}
+	.st107{fill:url(#SVGID_99_);}
+	.st108{fill:url(#SVGID_100_);}
+	.st109{fill:url(#SVGID_101_);}
+	.st110{display:inline;fill:url(#SVGID_102_);}
+	.st111{display:inline;fill:url(#SVGID_103_);}
+	.st112{fill:url(#SVGID_104_);}
+	.st113{fill:url(#SVGID_105_);}
+	.st114{fill:url(#SVGID_106_);}
+	.st115{fill:url(#SVGID_107_);}
+	.st116{fill:url(#SVGID_108_);}
+	.st117{opacity:0.4;fill:url(#SVGID_109_);}
+	.st118{fill:url(#SVGID_110_);}
+	.st119{fill:url(#SVGID_111_);}
+	.st120{fill:url(#SVGID_112_);}
+	.st121{fill:url(#SVGID_113_);}
+	.st122{fill:url(#SVGID_114_);}
+	.st123{opacity:0.4;fill:url(#SVGID_115_);}
+	.st124{fill:url(#SVGID_116_);}
+	.st125{fill:url(#SVGID_117_);}
+	.st126{fill:url(#SVGID_118_);}
+	.st127{fill:url(#SVGID_119_);}
+	.st128{fill:url(#SVGID_120_);}
+	.st129{fill:url(#SVGID_121_);}
+	.st130{fill:url(#SVGID_122_);}
+</style><switch
+     id="switch6"><g
+       i:extraneous="self"
+       id="g8"><g
+         id="Settings_Active"><circle
+           class="st24"
+           cx="159.7"
+           cy="133.4"
+           r="101.9"
+           id="circle1230" /><linearGradient
+           id="SVGID_119_"
+           gradientUnits="userSpaceOnUse"
+           x1="115.9317"
+           y1="254.1836"
+           x2="256.3852"
+           y2="-133.5267"><stop
+             offset="0"
+             style="stop-color:#8BC53F"
+             id="stop1233" /><stop
+             offset="2.015080e-02"
+             style="stop-color:#7CCB56;stop-opacity:0.9678"
+             id="stop1235" /><stop
+             offset="6.089833e-02"
+             style="stop-color:#62D67D;stop-opacity:0.9028"
+             id="stop1237" /><stop
+             offset="0.1057"
+             style="stop-color:#4BDFA0;stop-opacity:0.8312"
+             id="stop1239" /><stop
+             offset="0.1543"
+             style="stop-color:#38E7BE;stop-opacity:0.7537"
+             id="stop1241" /><stop
+             offset="0.2077"
+             style="stop-color:#28EED6;stop-opacity:0.6684"
+             id="stop1243" /><stop
+             offset="0.2681"
+             style="stop-color:#1CF3E8;stop-opacity:0.572"
+             id="stop1245" /><stop
+             offset="0.3394"
+             style="stop-color:#13F6F5;stop-opacity:0.4581"
+             id="stop1247" /><stop
+             offset="0.4323"
+             style="stop-color:#0EF8FD;stop-opacity:0.3098"
+             id="stop1249" /><stop
+             offset="0.6264"
+             style="stop-color:#0DF9FF;stop-opacity:0"
+             id="stop1251" /></linearGradient><circle
+           class="st127"
+           cx="159.7"
+           cy="133.4"
+           r="101.9"
+           id="circle1253" /><linearGradient
+           id="SVGID_120_"
+           gradientUnits="userSpaceOnUse"
+           x1="4.0481"
+           y1="287.9492"
+           x2="320.4859"
+           y2="-15.4029"
+           gradientTransform="matrix(1 5.464556e-03 -5.464556e-03 1 -2.0192 -3.0212)"><stop
+             offset="0"
+             style="stop-color:#59FF7F"
+             id="stop1256" /><stop
+             offset="1"
+             style="stop-color:#6BFBFF"
+             id="stop1258" /></linearGradient><path
+           class="st128"
+           d="M160,238.8c-0.2,0-0.4,0-0.6,0c-58-0.3-104.9-47.7-104.6-105.7C55.2,75.3,102.3,28.5,160,28.5     c0.2,0,0.4,0,0.6,0c58,0.3,104.9,47.7,104.6,105.7l0,0C264.8,192,217.7,238.8,160,238.8z M160,32.2     c-55.7,0-101.2,45.2-101.5,100.9c-0.3,55.9,45,101.7,100.9,102c0.2,0,0.4,0,0.6,0c55.7,0,101.2-45.2,101.5-100.9     c0.3-55.9-45-101.7-100.9-102C160.4,32.2,160.2,32.2,160,32.2z"
+           id="path1260" /><g
+           id="g1262"><text
+             transform="matrix(1 0 0 1 75.4379 284.7129)"
+             class="st4 st5 st6 st7"
+             id="text1264">SETTINGS</text>
+<g
+             id="g1266"><g
+               id="g1268"><g
+                 id="g1270"><linearGradient
+                   id="SVGID_121_"
+                   gradientUnits="userSpaceOnUse"
+                   x1="79.1804"
+                   y1="226.0817"
+                   x2="282.752"
+                   y2="-4.8609"><stop
+                     offset="0"
+                     style="stop-color:#59FF7F"
+                     id="stop1273" /><stop
+                     offset="1"
+                     style="stop-color:#6BFBFF"
+                     id="stop1275" /></linearGradient><path
+                   class="st129"
+                   d="M159.9,163.9c-16.3,0-29.5-13.2-29.5-29.4s13.2-29.4,29.5-29.4v3.9c-14.1,0-25.5,11.4-25.5,25.5         c0,14,11.5,25.5,25.5,25.5c14.1,0,25.6-11.4,25.6-25.5h3.9C189.4,150.7,176.2,163.9,159.9,163.9z"
+                   id="path1277" /></g><g
+                 id="g1279"><linearGradient
+                   id="SVGID_122_"
+                   gradientUnits="userSpaceOnUse"
+                   x1="79.2457"
+                   y1="226.1393"
+                   x2="282.8174"
+                   y2="-4.8033"><stop
+                     offset="0"
+                     style="stop-color:#59FF7F"
+                     id="stop1282" /><stop
+                     offset="1"
+                     style="stop-color:#6BFBFF"
+                     id="stop1284" /></linearGradient><path
+                   class="st130"
+                   d="M171.7,197.4h-23.4c-2.2,0-4-1.8-4-3.9V181c-2-0.7-4-1.5-6-2.5l-8.8,8.8c-1.5,1.5-4,1.5-5.6-0.1         l-16.6-16.6c-1.6-1.6-1.6-4.1-0.1-5.6l8.7-8.7c-1-2-1.8-4-2.5-6.1h-12.3c-2.2,0-3.9-1.8-3.9-4v-23.4c0-2.2,1.8-4,3.9-4h12.3         c0.9-2.6,1.9-5.1,3.2-7.4l3.5,1.8c-1.4,2.6-2.5,5.3-3.4,8.1l-0.4,1.4h-15.2l0,23.5l15.2,0.1l0.4,1.4c0.9,2.8,2,5.5,3.4,8         l0.7,1.3L110,167.8l16.6,16.6l10.9-10.8l1.3,0.7c2.6,1.4,5.2,2.5,8,3.3l1.4,0.4v15.4l23.5,0l0.1-15.4l1.4-0.4         c2.7-0.8,5.4-1.9,7.9-3.3l1.3-0.7l10.9,10.9l16.6-16.6l-10.8-11l0.7-1.3c1.4-2.6,2.5-5.2,3.3-7.9l0.4-1.4h15.4l0-23.5         l-15.3-0.1l-0.4-1.4c-0.8-2.8-1.9-5.5-3.3-8l-0.7-1.3l10.8-10.8l-16.6-16.6l-10.8,10.7l-1.3-0.7c-2.6-1.4-5.3-2.5-8.1-3.4         l-1.4-0.4V75.6l-23.5,0l-0.1,15.1l-1.4,0.4c-2.8,0.9-5.6,2-8.1,3.4l-1.3,0.7l-10.7-10.7L107.2,104c-1.5-1.5-1.5-4,0.1-5.6         l16.5-16.5c0.8-0.8,1.8-1.3,2.9-1.2c1,0,2,0.4,2.7,1.1l8.7,8.6c2-1,4-1.8,6.2-2.5V75.6c0-2.2,1.8-3.9,4-3.9h23.4         c2.2,0,4,1.8,4,3.9v12.3c2.1,0.7,4.1,1.6,6.1,2.5l8.7-8.7c0.7-0.7,1.7-1.1,2.7-1.1h0c1.1,0,2.1,0.4,2.9,1.2l16.6,16.6         c0.8,0.8,1.2,1.8,1.2,2.9c0,1-0.4,2-1.1,2.7l-8.8,8.8c1,2,1.8,4,2.5,6h12.4c2.2,0,3.9,1.8,3.9,4v23.4c0,2.2-1.8,4-3.9,4         h-12.5c-0.7,2-1.5,4-2.5,6l8.9,8.9c1.5,1.5,1.5,4-0.1,5.6l-16.6,16.6c-0.8,0.8-1.8,1.2-2.9,1.2h0c-1,0-2-0.4-2.7-1.1         l-8.9-8.9c-1.9,1-3.9,1.8-5.9,2.5v12.5C175.7,195.6,173.9,197.4,171.7,197.4z"
+                   id="path1286" /></g></g></g></g></g></g></switch></svg>
\ No newline at end of file
diff --git a/export.map b/export.map
deleted file mode 100644
index ee2f413..0000000
--- a/export.map
+++ /dev/null
@@ -1 +0,0 @@
-{ global: afbBindingV*; local: *; };
diff --git a/package/root/config.xml b/package/root/config.xml
deleted file mode 100644
index 375dc54..0000000
--- a/package/root/config.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" id="windowmanager-service" version="0.1">
-  <name>windowmanager-service</name>
-  <content src="config.xml" type="application/vnd.agl.service"/>
-  <description>Window Manager</description>
-  <author>TOYOTA</author>
-  <license>APL 2.0</license>
-  <feature name="urn:AGL:widget:required-permission">
-    <param name="urn:AGL:permission::public:hidden" value="required" />
-    <param name="urn:AGL:permission::system:run-by-default" value="required" />
-    <param name="urn:AGL:permission::public:display" value="required" />
-  </feature>
-  <feature name="urn:AGL:widget:provided-api">
-     <param name="windowmanager" value="ws" />
-  </feature>
-  <feature name="urn:AGL:widget:required-binding">
-    <param name="lib/windowmanager-service.so" value="local" />
-  </feature>
-</widget>
diff --git a/policy_manager/CMakeLists.txt b/policy_manager/CMakeLists.txt
index 3ec4c39..77ddd36 100644
--- a/policy_manager/CMakeLists.txt
+++ b/policy_manager/CMakeLists.txt
@@ -96,9 +96,9 @@ if (LINK_LIBCXX)
 endif()
 
 add_custom_command(TARGET ${TARGETS_PM} POST_BUILD
-   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
-   COMMAND cp -f ${PROJECT_BINARY_DIR}/${PLUGIN_PM}/lib${PLUGIN_PM}.so ${PROJECT_BINARY_DIR}/package/root/lib
-   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/${PLUGIN_PM}/db/states.db ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/${PLUGIN_PM}/db/${ROLES_DB_NAME} ${PROJECT_BINARY_DIR}/package/root/etc/roles.db
+   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/lib
+   COMMAND cp -f ${PROJECT_BINARY_DIR}/${PLUGIN_PM}/lib${PLUGIN_PM}.so ${PROJECT_BINARY_DIR}/package/lib
+   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/${PLUGIN_PM}/db/states.db ${PROJECT_BINARY_DIR}/package/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/${PLUGIN_PM}/db/${ROLES_DB_NAME} ${PROJECT_BINARY_DIR}/package/etc/roles.db
 )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1449da0..d35c17e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+# Copyright (C) 2020 Konsulko Group
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,68 +15,38 @@
 # limitations under the License.
 #
 
-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
-set(CMAKE_SHARED_MODULE_PREFIX "")
-
-set(TARGETS_WM windowmanager-service)
-
-add_library(${TARGETS_WM} MODULE
-   main.cpp
-   util.cpp
-   json_helper.cpp
-   applist.cpp
-   request.cpp
-   pm_wrapper.cpp
-   window_manager.cpp
-   wm_client.cpp
-   wm_error.cpp
-   wm_layer.cpp
-   wm_layer_control.cpp)
-
-target_include_directories(${TARGETS_WM}
-    PRIVATE
-        ${AFB_INCLUDE_DIRS}
-        ${SD_INCLUDE_DIRS}
-        ${ILM_INCLUDE_DIRS}
-        ../include
-        ../src
-        ../${PLUGIN_PM})
-
-target_link_libraries(${TARGETS_WM}
-    PRIVATE
-        ${AFB_LIBRARIES}
-        ${WLC_LIBRARIES}
-        ${ILM_LIBRARIES}
-        ${SD_LIBRARIES}
-        ${PLUGIN_PM})
-
-target_compile_definitions(${TARGETS_WM}
-    PRIVATE
+PROJECT_TARGET_ADD(windowmanager-service)
+
+# Define project Targets
+add_library(${TARGET_NAME} MODULE
+	main.cpp
+	util.cpp
+	json_helper.cpp
+	applist.cpp
+	request.cpp
+	pm_wrapper.cpp
+	window_manager.cpp
+	wm_client.cpp
+	wm_error.cpp
+	wm_layer.cpp
+	wm_layer_control.cpp)
+
+target_include_directories(${TARGET_NAME} PRIVATE
+	../${PLUGIN_PM})
+
+target_compile_definitions(${TARGET_NAME} PRIVATE
         AFB_BINDING_VERSION=3
         # We do not want source location of messages
         AFB_BINDING_PRAGMA_NO_VERBOSE_DETAILS
-        WINMAN_VERSION_STRING="${PACKAGE_VERSION}"
-        _GNU_SOURCE)
-
-if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Release")
-   target_compile_definitions(${TARGETS_WM}
-       PRIVATE
-           _GLIBCXX_DEBUG)
-endif()
+	WINMAN_VERSION_STRING="${PACKAGE_VERSION}")
 
-target_compile_options(${TARGETS_WM}
-    PRIVATE
-        -Wall -Wextra -Wno-unused-parameter -Wno-comment -Wno-missing-field-initializers)
-
-set_target_properties(${TARGETS_WM}
-    PROPERTIES
-    # INTERPROCEDURAL_OPTIMIZATION ON
+set_target_properties(${TARGET_NAME} PROPERTIES
+	LABELS "BINDING"
+	PREFIX ""
+	LINK_FLAGS ${BINDINGS_LINK_FLAG}
+	OUTPUT_NAME ${TARGET_NAME}
 
+	# INTERPROCEDURAL_OPTIMIZATION ON
         CXX_EXTENSIONS OFF
         CXX_STANDARD 14
         CXX_STANDARD_REQUIRED ON
@@ -83,43 +54,23 @@ set_target_properties(${TARGETS_WM}
         C_EXTENSIONS OFF
         C_STANDARD 99
         C_STANDARD_REQUIRED ON
+)
 
-        LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -Wl,-rpath,'$ORIGIN'")
+target_link_libraries(${TARGET_NAME} PRIVATE ${PLUGIN_PM})
 
-if (LINK_LIBCXX)
-   set_target_properties(${TARGETS_WM}
-           PROPERTIES
-           LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -lc++ -Wl,-rpath,'$ORIGIN'")
-endif()
+target_link_options(${TARGET_NAME} PRIVATE "-Wl,-rpath,'$ORIGIN'")
 
 if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
-   target_compile_options(${TARGETS_WM}
-      PRIVATE
-         -fsanitize=${SANITIZER_MODE} -g -fno-omit-frame-pointer)
-   set_target_properties(${TARGETS_WM}
-      PROPERTIES
-         LINK_FLAGS "-fsanitize=${SANITIZER_MODE} -g")
+	target_compile_options(${TARGET_NAME} PRIVATE
+		-fsanitize=${SANITIZER_MODE} -g -fno-omit-frame-pointer)
+	set_target_properties(${TARGET_NAME} PROPERTIES
+		LINK_FLAGS "-fsanitize=${SANITIZER_MODE} -g")
 endif()
 
-if(NOT EXISTS ${PROJECT_BINARY_DIR}/package)
-   add_custom_command(TARGET ${TARGETS_WM} POST_BUILD
-      COMMAND cp -rf ${PROJECT_SOURCE_DIR}/package ${PROJECT_BINARY_DIR}
-   )
-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 ${CMAKE_SOURCE_DIR}/conf/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/areas.json ${PROJECT_BINARY_DIR}/package/root/etc
+add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
+	COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/etc
+	COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/layers.json ${PROJECT_BINARY_DIR}/package/etc
+	COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/areas.json ${PROJECT_BINARY_DIR}/package/etc
 )
 
-add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
-   COMMAND wgtpkg-pack -f -o ${PROJECT_BINARY_DIR}/package/${TARGETS_WM}.wgt ${PROJECT_BINARY_DIR}/package/root
-)
 
-add_custom_target(widget DEPENDS ${PROJECT_BINARY_DIR}/package/${TARGETS_WM}.wgt
-   COMMAND cp -f ${PROJECT_BINARY_DIR}/package/${TARGETS_WM}.wgt ${PROJECT_BINARY_DIR}/${TARGETS_WM}.wgt
-)
-add_dependencies(widget package)