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
policy: add a simple policy stub, broke some layouting tho
[staging/windowmanager.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
a0d3db6
..
953b59a
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-1,16
+1,16
@@
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
set(CMAKE_SHARED_MODULE_PREFIX "")
add_custom_command(
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_
api.hpp afb_binding
.inl
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../generate-binding.py
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/../generate-binding.py)
+ 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)
add_library(winman MODULE
main.cpp
add_library(winman MODULE
main.cpp
@@
-18,7
+18,16
@@
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_api.hpp afb_binding.inl)
+ 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)
target_include_directories(winman
PRIVATE
target_include_directories(winman
PRIVATE
@@
-53,7
+62,7
@@
target_compile_options(winman
set_target_properties(winman
PROPERTIES
set_target_properties(winman
PROPERTIES
-
INTERPROCEDURAL_OPTIMIZATION ON
+
#
INTERPROCEDURAL_OPTIMIZATION ON
CXX_EXTENSIONS OFF
CXX_STANDARD 14
CXX_EXTENSIONS OFF
CXX_STANDARD 14
@@
-63,7
+72,13
@@
set_target_properties(winman
C_STANDARD 99
C_STANDARD_REQUIRED ON
C_STANDARD 99
C_STANDARD_REQUIRED ON
- LINK_FLAGS "-Wl,--version-script=../../export.map")
+ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map")
+
+if (LINK_LIBCXX)
+ set_target_properties(winman
+ PROPERTIES
+ LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../export.map -lc++")
+endif()
if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
target_compile_options(winman
if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
target_compile_options(winman