X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CMakeLists.txt;h=cee5a07fd048caf05f85fb11f5977fc5b46ea756;hb=7a31f839633c9192c98be1061792b8482f181990;hp=4a856289b4da6ac0060a3fbb44c7bc513c86e2ae;hpb=5dd6480727cc1ecb12483fc4d971d73176505748;p=src%2Fapp-framework-binder.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a856289..cee5a07f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ INCLUDE(GNUInstallDirs) add_compile_options(-Wall -Wextra -Wconversion) add_compile_options(-Wno-unused-parameter) # frankly not using a parameter does it care? +add_compile_options(-Wno-sign-compare -Wno-sign-conversion) add_compile_options(-Werror=maybe-uninitialized) add_compile_options(-Werror=implicit-function-declaration) add_compile_options(-ffunction-sections -fdata-sections) @@ -53,12 +54,11 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug) ENDIF(CMAKE_BUILD_TYPE MATCHES Debug) INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(libsystemd REQUIRED libsystemd) +PKG_CHECK_MODULES(libsystemd REQUIRED libsystemd>=222) PKG_CHECK_MODULES(json-c REQUIRED json-c) PKG_CHECK_MODULES(libmicrohttpd REQUIRED libmicrohttpd>=0.9.48) PKG_CHECK_MODULES(openssl REQUIRED openssl) PKG_CHECK_MODULES(uuid REQUIRED uuid) -PKG_CHECK_MODULES(dbus REQUIRED dbus-1) # Optional plugin dependencies PKG_CHECK_MODULES(alsa alsa) PKG_CHECK_MODULES(pulseaudio libpulse libpulse-simple) @@ -84,10 +84,6 @@ ENDIF(gupnp_FOUND) INCLUDE(FindThreads) FIND_PACKAGE(Threads) -#SET(include_dirs ${INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include ${json-c_INCLUDE_DIRS} ${libmicrohttpd_INCLUDE_DIRS} ${uuid_INCLUDE_DIRS} ${dbus_INCLUDE_DIRS} ${alsa_INCLUDE_DIRS} ${pulseaudio_INCLUDE_DIRS} ${librtlsdr_INCLUDE_DIRS} ${gupnp_INCLUDE_DIRS} ${openssl_INCLUDE_DIRS}) -#SET(link_libraries ${json-c_LIBRARIES} ${libmicrohttpd_LIBRARIES} ${uuid_LIBRARIES} ${dbus_LIBRARIES} ${alsa_LIBRARIES} ${pulseaudio_LIBRARIES} ${librtlsdr_LIBRARIES} ${gupnp_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${libefence_LIBRARIES} ${openssl_LIBRARIES} -lmagic -lm -ldl -lrt) -#SET(plugin_install_dir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/afb) - SET(include_dirs ${INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include @@ -95,11 +91,10 @@ SET(include_dirs ${json-c_INCLUDE_DIRS} ${libmicrohttpd_INCLUDE_DIRS} ${uuid_INCLUDE_DIRS} - ${dbus_INCLUDE_DIRS} -# ${alsa_INCLUDE_DIRS} -# ${pulseaudio_INCLUDE_DIRS} -# ${librtlsdr_INCLUDE_DIRS} -# ${gupnp_INCLUDE_DIRS} + ${alsa_INCLUDE_DIRS} + ${pulseaudio_INCLUDE_DIRS} + ${librtlsdr_INCLUDE_DIRS} + ${gupnp_INCLUDE_DIRS} ${openssl_INCLUDE_DIRS} ) @@ -108,11 +103,10 @@ SET(link_libraries ${json-c_LIBRARIES} ${libmicrohttpd_LIBRARIES} ${uuid_LIBRARIES} - ${dbus_LIBRARIES} -# ${alsa_LIBRARIES} -# ${pulseaudio_LIBRARIES} -# ${librtlsdr_LIBRARIES} -# ${gupnp_LIBRARIES} + ${alsa_LIBRARIES} + ${pulseaudio_LIBRARIES} + ${librtlsdr_LIBRARIES} + ${gupnp_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} # ${libefence_LIBRARIES} ${openssl_LIBRARIES}