X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=a04173e69a308a05790b785a4d1f0a49f6f50497;hb=9ce5644a2350f8acbf606b2ee1073727578111ee;hp=ebb1946848e9f92729e0bc9aacc3ba086f5fd3fd;hpb=1958da2130c04fbcc0bf1da2c40b57c785657e48;p=staging%2Fwindowmanager.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ebb1946..a04173e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 wlproto(IVI_CON ivi-controller)
 
 include(FindPkgConfig)
-pkg_check_modules(AFB REQUIRED afb-daemon==1.0)
+pkg_check_modules(AFB REQUIRED afb-daemon)
 pkg_check_modules(SD REQUIRED libsystemd>=222)
 
 # We do not want a prefix for our module
@@ -18,7 +18,15 @@ add_library(winman MODULE
    wayland.hpp
    util.cpp
    util.hpp
-   ${IVI_CON_PROTO} json_helper.cpp json_helper.hpp app.hpp app.cpp result.hpp afb_binding_api.hpp afb_binding_glue.inl)
+   layout.cpp
+   layout.hpp
+   ${IVI_CON_PROTO}
+   json_helper.cpp
+   json_helper.hpp
+   app.hpp app.cpp
+   result.hpp
+   afb_binding_api.hpp
+   afb_binding_glue.inl)
 
 target_include_directories(winman
     PRIVATE
@@ -65,6 +73,12 @@ set_target_properties(winman
 
         LINK_FLAGS "-Wl,--version-script=../../export.map")
 
+if (LINK_LIBCXX)
+   set_target_properties(winman
+           PROPERTIES
+           LINK_FLAGS "-Wl,--version-script=../../export.map -lc++")
+endif()
+
 if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
    target_compile_options(winman
       PRIVATE