Revert "Enable scaling to fit various screen resolutions"

[apps/agl-service-windowmanager.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc7e8ad..42b81b7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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,21 @@ 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
+   window_manager.cpp
    layers.cpp
-   layers.hpp
-   controller_hooks.hpp
-   config.cpp
-   config.hpp
-   policy.hpp)
+   wm_client.cpp
+   wm_error.cpp
+   applist.cpp
+   request.cpp)
 
 target_include_directories(${TARGETS_WM}
     PRIVATE
@@ -72,7 +58,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}
@@ -124,6 +110,8 @@ add_custom_command(TARGET ${TARGETS_WM} POST_BUILD
    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
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/old_roles.db ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/areas.db ${PROJECT_BINARY_DIR}/package/root/etc
 )
 
 add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root