Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
cmake: fix source list layout
[staging/windowmanager.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
ebb1946
..
a04173e
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-1,7
+1,7
@@
wlproto(IVI_CON ivi-controller)
include(FindPkgConfig)
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
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
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
target_include_directories(winman
PRIVATE
@@
-65,6
+73,12
@@
set_target_properties(winman
LINK_FLAGS "-Wl,--version-script=../../export.map")
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
if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
target_compile_options(winman
PRIVATE