X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=9144194bf02d51134776573093c78b0f1dcf20b0;hb=e48b6fb595d90509d70f850244fc962f8440a14b;hp=fe497fc9404df538cc00125971975a89375d3b8c;hpb=69d7968b9713dafa23268ee34516e50133ca8b36;p=src%2Fapp-framework-binder.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe497fc9..9144194b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,39 +22,13 @@ 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
@@ -63,6 +37,7 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-api-so-v2.c
 	afb-api-ws.c
 	afb-apiset.c
+	afb-auth.c
 	afb-common.c
 	afb-config.c
 	afb-context.c
@@ -74,8 +49,8 @@ ADD_LIBRARY(afb-lib STATIC
 	afb-hsrv.c
 	afb-hswitch.c
 	afb-method.c
+	afb-monitor.c
 	afb-msg-json.c
-	afb-perm.c
 	afb-session.c
 	afb-stub-ws.c
 	afb-subcall.c
@@ -101,13 +76,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})
@@ -120,7 +88,8 @@ SET_TARGET_PROPERTIES(afbwsc PROPERTIES
 	VERSION ${LIBAFBWSC_VERSION}
 	SOVERSION ${LIBAFBWSC_SOVERSION})
 TARGET_LINK_LIBRARIES(afbwsc
-	${libsystemd_LIBRARIES}
+	${libsystemd_LDFLAGS}
+	${json-c_LDFLAGS}
 	-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/export-afbwsc.map
 	-Wl,--as-needed
 	-Wl,--gc-sections
@@ -135,7 +104,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})