acarsdec next? :-)

.gitignore

@@ -2,3 +2,4 @@ acarsdec
 acarsserv
 .*.swp
 *.o
+build/

CMakeLists.txt

@@ -1,91 +1,112 @@
 cmake_minimum_required (VERSION 3.2)
 project (acarsdec C)
 
-add_compile_options(-Ofast -march=native)
+add_compile_options(-Ofast)
 
-add_executable(acarsdec acars.c  acarsdec.c  cJSON.c  label.c  msk.c  output.c netout.c fileout.c )
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+
+add_executable(acarsdec acars.c  acarsdec.c  label.c  msk.c  output.c netout.c fileout.c lib.c statsd.c)
 
 find_package(PkgConfig)
-if(PKG_CONFIG_FOUND)
+if(NOT PKG_CONFIG_FOUND)
+message ( FATAL_ERROR "pkg-config NOT FOUND")
+endif()
+
+pkg_check_modules(LIBCJSON libcjson)
+if(LIBCJSON_FOUND)
+add_definitions(-DHAVE_CJSON )
+target_link_libraries(acarsdec ${LIBCJSON_LIBRARIES})
+target_include_directories(acarsdec PUBLIC ${LIBCJSON_INCLUDE_DIRS})
+target_link_directories(acarsdec PUBLIC ${LIBCJSON_LIBRARY_DIRS})
+
+ SET(WITH_MQTT NO)
+ find_library(MQTT paho-mqtt3a)
+ if(MQTT)
+ add_definitions(-DWITH_MQTT )
+ target_sources( acarsdec PRIVATE mqttout.c)
+ find_path(MQTT_INCPATH MQTTAsync.h)
+ target_include_directories(acarsdec PUBLIC ${MQTT_INCPATH})
+ target_link_libraries(acarsdec ${MQTT})
+ SET(WITH_MQTT YES)
+ endif()
+ message ( STATUS "Using paho-mqtt3a: ${WITH_MQTT}")
+
+endif()
+
+SET(WITH_ALSA NO)
+pkg_check_modules(LIBASOUND alsa)
+if(LIBASOUND_FOUND)
+add_definitions(-DWITH_ALSA )
+target_sources( acarsdec PRIVATE alsa.c)
+target_link_libraries(acarsdec ${LIBASOUND_LIBRARIES})
+target_include_directories(acarsdec PUBLIC ${LIBASOUND_INCLUDE_DIRS})
+target_link_directories(acarsdec PUBLIC ${LIBASOUND_LIBRARY_DIRS})
+SET(WITH_ALSA YES)
+endif()
+message ( STATUS "Using alsa: ${WITH_ALSA}")
+
+SET(WITH_LIBACARS NO)
 pkg_check_modules(LIBACARS libacars-2>=2.0.0)
 if(LIBACARS_FOUND)
-message ( STATUS "Using libacars")
 add_definitions(-DHAVE_LIBACARS )
 target_link_libraries(acarsdec ${LIBACARS_LIBRARIES})
 target_include_directories(acarsdec PUBLIC ${LIBACARS_INCLUDE_DIRS})
-link_directories(${LIBACARS_LIBRARY_DIRS})
-else()
-message ( STATUS "Not using libacars")
-endif()
-endif()
-
-find_library(MQTT paho-mqtt3a)
-if(MQTT)
-message ( STATUS "Using MQTT")
-add_definitions(-DWITH_MQTT )
-target_sources( acarsdec PRIVATE mqttout.c)
-target_link_libraries(acarsdec ${MQTT})
-else()
-message ( STATUS "Not using MQTT")
+target_link_directories(acarsdec PUBLIC ${LIBACARS_LIBRARY_DIRS})
+SET(WITH_LIBACARS YES)
 endif()
+message ( STATUS "Using libacars: ${WITH_LIBACARS}")
 
+SET(WITH_SNDFILE NO)
 find_library(LIBSNDFILE sndfile)
 if(LIBSNDFILE)
-message ( STATUS "Using libsnd")
 add_definitions(-DWITH_SNDFILE )
 target_sources( acarsdec PRIVATE soundfile.c)
+find_path(LIBSNDFILE_INCPATH sndfile.h)
+target_include_directories(acarsdec PUBLIC ${LIBSNDFILE_INCPATH})
 target_link_libraries(acarsdec ${LIBSNDFILE})
-else()
-message ( STATUS "Not using libsndfile")
+SET(WITH_SNDFILE YES)
 endif()
+message ( STATUS "Using libsnd: ${WITH_SNDFILE}")
 
-option(rtl "Compiling for rtl sdr" )
-if(rtl)
+SET(WITH_RTL NO)
 find_library(LIBRTL rtlsdr)
-if(NOT LIBRTL)
-message (FATAL_ERROR "librtlsdr path not found")
-endif()
+if(LIBRTL)
 add_definitions(-DWITH_RTL )
 target_sources( acarsdec PRIVATE rtl.c)
 target_link_libraries( acarsdec ${LIBRTL})
+SET(WITH_RTL YES)
 endif()
+message ( STATUS "Using librtlsdr: ${WITH_RTL}")
 
-option(airspy "Compiling for airspy sdr" )
-if(airspy)
+SET(WITH_AIR NO)
 find_library(LIBAIR airspy)
-if(NOT LIBAIR)
-message ( FATAL_ERROR "libairspy path not found")
-endif()
+if(LIBAIR)
 add_definitions(-DWITH_AIR )
 target_sources( acarsdec PRIVATE air.c)
 target_link_libraries( acarsdec ${LIBAIR})
+SET(WITH_AIR YES)
 endif()
+message ( STATUS "Using libairspy: ${WITH_AIR}")
 
-option(sdrplay "Compiling for sdrplay sdr" )
-if(sdrplay)
+SET(WITH_SDRPLAY NO)
 find_library(LIBPLAY mirsdrapi-rsp)
-if(NOT LIBPLAY)
-message ( FATAL_ERROR "libmirsdrapi-rsp path not found")
-endif()
+if(LIBPLAY)
 add_definitions(-DWITH_SDRPLAY )
 target_sources( acarsdec PRIVATE sdrplay.c)
 target_link_libraries( acarsdec ${LIBPLAY})
+SET(WITH_SDRPLAY YES)
 endif()
+message ( STATUS "Using libmirsdrapi-rsp: ${WITH_SDRPLAY}")
 
-option(soapy "Compiling for soapy sdr" )
-if(soapy)
+SET(WITH_SOAPY NO)
 find_library(LIBSOAPY SoapySDR)
-if(NOT LIBSOAPY)
-message ( FATAL_ERROR "libSoapySDR path not found")
-endif()
+if(LIBSOAPY)
 add_definitions(-DWITH_SOAPY )
 target_sources( acarsdec PRIVATE soapy.c)
 target_link_libraries( acarsdec ${LIBSOAPY})
+SET(WITH_SOAPY YES)
 endif()
-
-if(NOT rtl AND NOT airspy AND NOT sdrplay AND NOT soapy)
-message ("No sdr option set ! are you sure ?")
-endif()
+message ( STATUS "Using libSoapySDR: ${WITH_SOAPY}")
 
 target_link_libraries( acarsdec pthread m )