X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=f727500fe74e15efd2a12bd9dd73cc7b8dcb8ca2;hb=2a352777521301937b0d1d4cdcf0e24a1aa2d84e;hp=fc7e8ad1e2c56c1be73b99481c5fd2890f625ffd;hpb=afd5c59cdfeeb142feb57afe7d3d47f5f83fda45;p=apps%2Fagl-service-windowmanager-2017.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fc7e8ad..f727500 100644 --- 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,17 @@ 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 - layers.cpp - layers.hpp - controller_hooks.hpp - config.cpp - config.hpp - policy.hpp) + app.cpp + layers.cpp) 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}" - _GNU_SOURCE) # XXX should I define this here?! + _GNU_SOURCE) if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Release") target_compile_definitions(${TARGETS_WM}