Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bindings V2: migration of HelloWorld binder
[src/app-framework-binder.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
0fcfba6
..
d253d38
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-22,7
+22,12
@@
endif(CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
INCLUDE(FindPkgConfig)
INCLUDE(FindPkgConfig)
+ADD_SUBDIRECTORY(genskel)
+ADD_SUBDIRECTORY(tests)
+
ADD_DEFINITIONS(-DBINDING_INSTALL_DIR="${binding_install_dir}")
ADD_DEFINITIONS(-DBINDING_INSTALL_DIR="${binding_install_dir}")
+# Always add INFER_EXTENSION (more details in afb-hreq.c)
+ADD_DEFINITIONS(-DINFER_EXTENSION)
CHECK_INCLUDE_FILES(magic.h HAVE_MAGIC_H)
CHECK_LIBRARY_EXISTS(magic magic_load "" HAVE_LIBMAGIC_SO)
CHECK_INCLUDE_FILES(magic.h HAVE_MAGIC_H)
CHECK_LIBRARY_EXISTS(magic magic_load "" HAVE_LIBMAGIC_SO)
@@
-36,11
+41,17
@@
IF(NOT HAVE_LIBMAGIC)
MESSAGE(FATAL_ERROR "\"magic.h\" or \"libmagic.so\" missing.
Please install the \"file-devel\" or \"libmagic-dev\" package !")
ENDIF(NOT HAVE_LIBMAGIC)
MESSAGE(FATAL_ERROR "\"magic.h\" or \"libmagic.so\" missing.
Please install the \"file-devel\" or \"libmagic-dev\" package !")
ENDIF(NOT HAVE_LIBMAGIC)
+ADD_DEFINITIONS(-DUSE_MAGIC_MIME_TYPE)
PKG_CHECK_MODULES(libsystemd REQUIRED libsystemd>=222)
PKG_CHECK_MODULES(libsystemd REQUIRED libsystemd>=222)
-PKG_CHECK_MODULES(libmicrohttpd REQUIRED libmicrohttpd>=0.9.
48
)
+PKG_CHECK_MODULES(libmicrohttpd REQUIRED libmicrohttpd>=0.9.
54
)
PKG_CHECK_MODULES(openssl REQUIRED openssl)
PKG_CHECK_MODULES(uuid REQUIRED uuid)
PKG_CHECK_MODULES(openssl REQUIRED openssl)
PKG_CHECK_MODULES(uuid REQUIRED uuid)
+PKG_CHECK_MODULES(cynara cynara-client)
+
+IF(cynara_FOUND)
+ ADD_DEFINITIONS(-DBACKEND_PERMISSION_IS_CYNARA)
+ENDIF(cynara_FOUND)
INCLUDE_DIRECTORIES(
${include_dirs}
INCLUDE_DIRECTORIES(
${include_dirs}
@@
-48,33
+59,45
@@
INCLUDE_DIRECTORIES(
${libmicrohttpd_INCLUDE_DIRS}
${uuid_INCLUDE_DIRS}
${openssl_INCLUDE_DIRS}
${libmicrohttpd_INCLUDE_DIRS}
${uuid_INCLUDE_DIRS}
${openssl_INCLUDE_DIRS}
+ ${cynara_INCLUDE_DIRS}
)
ADD_LIBRARY(afb-lib STATIC
)
ADD_LIBRARY(afb-lib STATIC
+ afb-api.c
afb-api-dbus.c
afb-api-so.c
afb-api-dbus.c
afb-api-so.c
+ afb-api-so-v1.c
+ afb-api-so-v2.c
afb-api-ws.c
afb-api-ws.c
- afb-apis.c
+ afb-apiset.c
+ afb-auth.c
afb-common.c
afb-common.c
+ afb-config.c
afb-context.c
afb-context.c
+ afb-cred.c
+ afb-ditf.c
afb-evt.c
afb-hook.c
afb-hreq.c
afb-hsrv.c
afb-hswitch.c
afb-method.c
afb-evt.c
afb-hook.c
afb-hreq.c
afb-hsrv.c
afb-hswitch.c
afb-method.c
+ afb-monitor.c
afb-msg-json.c
afb-session.c
afb-msg-json.c
afb-session.c
- afb-sig-handler.c
- afb-svc.c
+ afb-stub-ws.c
afb-subcall.c
afb-subcall.c
- afb-
thread
.c
+ afb-
svc
.c
afb-websock.c
afb-ws-client.c
afb-ws-json1.c
afb-ws.c
afb-wsj1.c
afb-websock.c
afb-ws-client.c
afb-ws-json1.c
afb-ws.c
afb-wsj1.c
+ afb-xreq.c
+ jobs.c
locale-root.c
locale-root.c
+ sd-fds.c
+ sig-monitor.c
verbose.c
websock.c
)
verbose.c
websock.c
)
@@
-86,10
+109,11
@@
ADD_EXECUTABLE(afb-daemon main.c)
TARGET_LINK_LIBRARIES(afb-daemon
afb-lib
${link_libraries}
TARGET_LINK_LIBRARIES(afb-daemon
afb-lib
${link_libraries}
- ${libsystemd_LIBRARIES}
- ${libmicrohttpd_LIBRARIES}
- ${uuid_LIBRARIES}
- ${openssl_LIBRARIES}
+ ${libsystemd_LDFLAGS}
+ ${libmicrohttpd_LDFLAGS}
+ ${uuid_LDFLAGS}
+ ${openssl_LDFLAGS}
+ ${cynara_LDFLAGS}
-lmagic
-ldl
-lrt
-lmagic
-ldl
-lrt
@@
-105,7
+129,7
@@
SET_TARGET_PROPERTIES(afbwsc PROPERTIES
VERSION ${LIBAFBWSC_VERSION}
SOVERSION ${LIBAFBWSC_SOVERSION})
TARGET_LINK_LIBRARIES(afbwsc
VERSION ${LIBAFBWSC_VERSION}
SOVERSION ${LIBAFBWSC_SOVERSION})
TARGET_LINK_LIBRARIES(afbwsc
- ${libsystemd_L
IBRARIE
S}
+ ${libsystemd_L
DFLAG
S}
-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-afbwsc.map
-Wl,--as-needed
-Wl,--gc-sections
-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-afbwsc.map
-Wl,--as-needed
-Wl,--gc-sections
@@
-120,7
+144,7
@@
ADD_EXECUTABLE(afb-client-demo afb-client-demo.c)
TARGET_LINK_LIBRARIES(afb-client-demo
afbwsc
${link_libraries}
TARGET_LINK_LIBRARIES(afb-client-demo
afbwsc
${link_libraries}
- ${libsystemd_L
IBRARIE
S}
+ ${libsystemd_L
DFLAG
S}
)
INSTALL(TARGETS afb-client-demo
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
)
INSTALL(TARGETS afb-client-demo
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})