X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=0e39dc9416305a2eca9ee058c446914f014f6ed6;hb=e000e3b73ee0582882324e504fe2dae7386534f8;hp=8d0121a58547633dff99c1c50d9e34d71d0c618e;hpb=e2c431bcda7f057b4767c3e8142b9e0ca0d32bc6;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8d0121a5..0e39dc94 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,9 @@ endif(CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
 
 INCLUDE(FindPkgConfig)
 
+ADD_SUBDIRECTORY(genskel)
+ADD_SUBDIRECTORY(tests)
+
 ADD_DEFINITIONS(-DBINDING_INSTALL_DIR="${binding_install_dir}")
 # Always add INFER_EXTENSION (more details in afb-hreq.c)
 ADD_DEFINITIONS(-DINFER_EXTENSION)
@@ -41,9 +44,14 @@ ENDIF(NOT HAVE_LIBMAGIC)
 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(cynara cynara-client)
+
+IF(cynara_FOUND)
+	ADD_DEFINITIONS(-DBACKEND_PERMISSION_IS_CYNARA)
+ENDIF(cynara_FOUND)
 
 INCLUDE_DIRECTORIES(
 	${include_dirs}
@@ -51,37 +59,47 @@ INCLUDE_DIRECTORIES(
 	${libmicrohttpd_INCLUDE_DIRS}
 	${uuid_INCLUDE_DIRS}
 	${openssl_INCLUDE_DIRS}
+	${cynara_INCLUDE_DIRS}
 )
 
 ADD_LIBRARY(afb-lib STATIC
+	afb-api.c
 	afb-api-dbus.c
 	afb-api-so.c
+	afb-api-so-v1.c
+	afb-api-so-v2.c
 	afb-api-ws.c
-	afb-apis.c
+	afb-apiset.c
+	afb-auth.c
 	afb-common.c
 	afb-config.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-monitor.c
 	afb-msg-json.c
 	afb-session.c
-	afb-sig-handler.c
-	afb-svc.c
+	afb-stub-ws.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-xreq.c
+	jobs.c
 	locale-root.c
+	sd-fds.c
+	sig-monitor.c
 	verbose.c
 	websock.c
-	sd-fds.c
 )
 
 ###########################################
@@ -91,14 +109,16 @@ ADD_EXECUTABLE(afb-daemon main.c)
 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
 )
+link_directories( /opt/libmicrohttpd-0.9.54/lib/ )
 INSTALL(TARGETS afb-daemon
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
@@ -110,7 +130,7 @@ SET_TARGET_PROPERTIES(afbwsc PROPERTIES
 	VERSION ${LIBAFBWSC_VERSION}
 	SOVERSION ${LIBAFBWSC_SOVERSION})
 TARGET_LINK_LIBRARIES(afbwsc
-	${libsystemd_LIBRARIES}
+	${libsystemd_LDFLAGS}
 	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-afbwsc.map
 	-Wl,--as-needed
 	-Wl,--gc-sections
@@ -125,7 +145,7 @@ ADD_EXECUTABLE(afb-client-demo afb-client-demo.c)
 TARGET_LINK_LIBRARIES(afb-client-demo
 	afbwsc
 	${link_libraries}
-	${libsystemd_LIBRARIES}
+	${libsystemd_LDFLAGS}
 )
 INSTALL(TARGETS afb-client-demo
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})