X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=f0e1d448835f9f132e3fd77d4d898f0c55f998d4;hb=0891ef4826e347d5554c630b5c0ce73c68f76c9c;hp=089c46249be523d39c3257b7104a36f18274dc7c;hpb=b6ad3eb5c49252c989e0d8ecd2664aae10e8db8b;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 089c4624..f0e1d448 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,56 +20,28 @@ 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)
 
-CHECK_INCLUDE_FILES(magic.h HAVE_MAGIC_H)
-CHECK_LIBRARY_EXISTS(magic magic_load "" HAVE_LIBMAGIC_SO)
-IF(HAVE_MAGIC_H)
-  IF(HAVE_LIBMAGIC_SO)
-    SET(HAVE_LIBMAGIC "1")
-  ENDIF(HAVE_LIBMAGIC_SO)
-ENDIF(HAVE_MAGIC_H)
-
-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)
-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(openssl REQUIRED openssl)
-PKG_CHECK_MODULES(uuid REQUIRED uuid)
-
-INCLUDE_DIRECTORIES(
-	${include_dirs}
-	${libsystemd_INCLUDE_DIRS}
-	${libmicrohttpd_INCLUDE_DIRS}
-	${uuid_INCLUDE_DIRS}
-	${openssl_INCLUDE_DIRS}
-)
-
 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
 	afb-common.c
 	afb-config.c
 	afb-context.c
 	afb-cred.c
-	afb-ditf.c
+	afb-debug.c
 	afb-evt.c
+	afb-export.c
 	afb-hook.c
 	afb-hreq.c
 	afb-hsrv.c
@@ -77,11 +49,10 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-method.c
 	afb-monitor.c
 	afb-msg-json.c
-	afb-perm.c
+	afb-proto-ws.c
 	afb-session.c
 	afb-stub-ws.c
-	afb-subcall.c
-	afb-svc.c
+	afb-trace.c
 	afb-websock.c
 	afb-ws-client.c
 	afb-ws-json1.c
@@ -90,10 +61,13 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-xreq.c
 	jobs.c
 	locale-root.c
+	process-name.c
 	sd-fds.c
 	sig-monitor.c
+	subpath.c
 	verbose.c
 	websock.c
+	wrap-json.c
 )
 
 ###########################################
@@ -103,13 +77,6 @@ ADD_EXECUTABLE(afb-daemon main.c)
 TARGET_LINK_LIBRARIES(afb-daemon
 	afb-lib
 	${link_libraries}
-	${libsystemd_LIBRARIES}
-	${libmicrohttpd_LIBRARIES}
-	${uuid_LIBRARIES}
-	${openssl_LIBRARIES}
-	-lmagic
-	-ldl
-	-lrt
 )
 INSTALL(TARGETS afb-daemon
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -117,18 +84,20 @@ INSTALL(TARGETS afb-daemon
 ###########################################
 # 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)
 SET_TARGET_PROPERTIES(afbwsc PROPERTIES
 	VERSION ${LIBAFBWSC_VERSION}
 	SOVERSION ${LIBAFBWSC_SOVERSION})
 TARGET_LINK_LIBRARIES(afbwsc
-	${libsystemd_LIBRARIES}
+	${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
@@ -137,9 +106,8 @@ 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})
 
-