X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=c789fca3c92f82311265e21f73b38e971d910b84;hb=1d74c9da7dc716e3add5163859d3a4d8a10be467;hp=0e05f850273380e06acaec519a89f0ce62aafc85;hpb=59cd34b59853f6a47e756d7ab5bc0329f40a471c;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0e05f850..c789fca3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 ###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
+# Copyright (C) 2015-2018 "IoT.bzh"
 #
 # author: José Bollo <jose.bollo@iot.bzh>
 #
@@ -20,22 +20,17 @@ if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
     message(FATAL_ERROR "Require at least gcc-4.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)
 
 ADD_LIBRARY(afb-lib STATIC
 	afb-api.c
-	afb-api-dbus.c
 	afb-api-dyn.c
 	afb-api-so.c
 	afb-api-so-v1.c
 	afb-api-so-v2.c
+	afb-api-so-vdyn.c
 	afb-api-ws.c
 	afb-apiset.c
 	afb-auth.c
@@ -46,6 +41,7 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-debug.c
 	afb-evt.c
 	afb-export.c
+	afb-fdev.c
 	afb-hook.c
 	afb-hreq.c
 	afb-hsrv.c
@@ -56,6 +52,8 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-proto-ws.c
 	afb-session.c
 	afb-stub-ws.c
+	afb-supervision.c
+	afb-systemd.c
 	afb-trace.c
 	afb-websock.c
 	afb-ws-client.c
@@ -63,10 +61,12 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-ws.c
 	afb-wsj1.c
 	afb-xreq.c
+	fdev.c
+	fdev-epoll.c
+	fdev-systemd.c
 	jobs.c
 	locale-root.c
 	process-name.c
-	sd-fds.c
 	sig-monitor.c
 	subpath.c
 	verbose.c
@@ -74,6 +74,11 @@ ADD_LIBRARY(afb-lib STATIC
 	wrap-json.c
 )
 
+IF(INCLUDE_DBUS_TRANSPARENCY)
+	ADD_DEFINITIONS(-DWITH_DBUS_TRANSPARENCY)
+	TARGET_SOURCES(afb-lib PUBLIC afb-api-dbus.c)
+ENDIF()
+
 ###########################################
 # build and install afb-daemon
 ###########################################
@@ -85,22 +90,36 @@ TARGET_LINK_LIBRARIES(afb-daemon
 INSTALL(TARGETS afb-daemon
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+###########################################
+# build and install afb-daemon
+###########################################
+IF(INCLUDE_SUPERVISOR)
+	ADD_EXECUTABLE(afs-supervisor afs-main.c afs-supervisor.c afs-discover.c afs-config.c)
+	TARGET_LINK_LIBRARIES(afs-supervisor
+		afb-lib
+		${link_libraries}
+	)
+	INSTALL(TARGETS afs-supervisor
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ENDIF()
+
 ###########################################
 # build and install libafbwsc
 ###########################################
-ADD_LIBRARY(afbwsc SHARED afb-ws.c afb-ws-client.c afb-wsj1.c websock.c)
+ADD_LIBRARY(afbwsc SHARED afb-ws.c afb-ws-client.c afb-wsj1.c websock.c afb-proto-ws.c jobs-fake.c fdev.c fdev-systemd.c)
 SET_TARGET_PROPERTIES(afbwsc PROPERTIES
 	VERSION ${LIBAFBWSC_VERSION}
 	SOVERSION ${LIBAFBWSC_SOVERSION})
 TARGET_LINK_LIBRARIES(afbwsc
 	${libsystemd_LDFLAGS}
 	${json-c_LDFLAGS}
+	-lpthread
 	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-afbwsc.map
 	-Wl,--as-needed
 	-Wl,--gc-sections
 )
 INSTALL(TARGETS afbwsc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-INSTALL(FILES afb-wsj1.h afb-ws-client.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/afb)
+INSTALL(FILES afb-wsj1.h afb-ws-client.h afb-proto-ws.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/afb)
 
 ###########################################
 # build and install afb-client-demo
@@ -114,4 +133,3 @@ TARGET_LINK_LIBRARIES(afb-client-demo
 INSTALL(TARGETS afb-client-demo
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-