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
Check for g_wayland in every API call.
[staging/windowmanager.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
fda32c1
..
4a0eafe
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-1,19
+1,38
@@
wlproto(IVI_CON ivi-controller)
wlproto(IVI_CON ivi-controller)
-add_executable(winman
+include(FindPkgConfig)
+pkg_check_modules(AFB REQUIRED afb-daemon==1.0)
+pkg_check_modules(SD REQUIRED libsystemd>=222)
+
+# We do not want a prefix for our module
+set(CMAKE_SHARED_MODULE_PREFIX "")
+
+add_library(winman MODULE
main.cpp
wayland.cpp
wayland.hpp
main.cpp
wayland.cpp
wayland.hpp
- util.c
- util.h
+ util.c
pp
+ util.h
pp
${IVI_CON_PROTO})
${IVI_CON_PROTO})
+target_include_directories(winman
+ PRIVATE
+ ${AFB_INCLUDE_DIRS}
+ ${SD_INCLUDE_DIRS}
+ ../include)
+
+target_link_libraries(winman
+ PRIVATE
+ ${AFB_LIBRARIES}
+ ${WLC_LIBRARIES}
+ ${SD_LIBRARIES})
+
target_compile_definitions(winman
PRIVATE
WINMAN_VERSION_STRING="${PACKAGE_VERSION}"
_GNU_SOURCE) # XXX should I define this here?!
target_compile_definitions(winman
PRIVATE
WINMAN_VERSION_STRING="${PACKAGE_VERSION}"
_GNU_SOURCE) # XXX should I define this here?!
-if(
${CMAKE_BUILD_TYPE} STREQUAL "Debug
")
+if(
NOT ${CMAKE_BUILD_TYPE} STREQUAL "Release
")
target_compile_definitions(winman
PRIVATE
_GLIBCXX_DEBUG)
target_compile_definitions(winman
PRIVATE
_GLIBCXX_DEBUG)
@@
-33,7
+52,9
@@
set_target_properties(winman
C_EXTENSIONS OFF
C_STANDARD 99
C_EXTENSIONS OFF
C_STANDARD 99
- C_STANDARD_REQUIRED ON)
+ C_STANDARD_REQUIRED ON
+
+ LINK_FLAGS "-Wl,--version-script=../../export.map")
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
@@
-43,6
+64,3
@@
if (NOT ${SANITIZER_MODE} STREQUAL "none" AND NOT ${SANITIZER_MODE} STREQUAL "")
PROPERTIES
LINK_FLAGS "-fsanitize=${SANITIZER_MODE} -g")
endif()
PROPERTIES
LINK_FLAGS "-fsanitize=${SANITIZER_MODE} -g")
endif()
-
-target_link_libraries(winman
- ${WLC_LIBRARIES})