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: Remove explicit references to daemon/service
[src/app-framework-binder.git]
/
src
/
CMakeLists.txt
diff --git
a/src/CMakeLists.txt
b/src/CMakeLists.txt
index
bec9124
..
d253d38
100644
(file)
--- a/
src/CMakeLists.txt
+++ b/
src/CMakeLists.txt
@@
-22,6
+22,7
@@
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_SUBDIRECTORY(tests)
ADD_DEFINITIONS(-DBINDING_INSTALL_DIR="${binding_install_dir}")
@@
-43,9
+44,14
@@
ENDIF(NOT HAVE_LIBMAGIC)
ADD_DEFINITIONS(-DUSE_MAGIC_MIME_TYPE)
PKG_CHECK_MODULES(libsystemd REQUIRED libsystemd>=222)
ADD_DEFINITIONS(-DUSE_MAGIC_MIME_TYPE)
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}
@@
-53,6
+59,7
@@
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
@@
-63,6
+70,7
@@
ADD_LIBRARY(afb-lib STATIC
afb-api-so-v2.c
afb-api-ws.c
afb-apiset.c
afb-api-so-v2.c
afb-api-ws.c
afb-apiset.c
+ afb-auth.c
afb-common.c
afb-config.c
afb-context.c
afb-common.c
afb-config.c
afb-context.c
@@
-76,7
+84,6
@@
ADD_LIBRARY(afb-lib STATIC
afb-method.c
afb-monitor.c
afb-msg-json.c
afb-method.c
afb-monitor.c
afb-msg-json.c
- afb-perm.c
afb-session.c
afb-stub-ws.c
afb-subcall.c
afb-session.c
afb-stub-ws.c
afb-subcall.c
@@
-102,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
@@
-121,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
@@
-136,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})