diff options
| -rw-r--r-- | CMakeLists.txt | 46 | ||||
| -rw-r--r-- | sm-http-server.cpp (renamed from sm_web_server.cpp) | 0 | ||||
| -rw-r--r-- | sm-mqtt-consumer.cpp (renamed from main.cpp) | 0 |
3 files changed, 23 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9d9691..11ede97 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.2) -project(mqtt_cassandra_bridge) +project(soil-moisture) find_package(Boost COMPONENTS system program_options unit_test_framework REQUIRED) @@ -44,37 +44,37 @@ ExternalProject_Add(nghttp2 # OpenSSL # TODO: proper discovery -# mqtt_cassandra_bridge -add_executable(mqtt_cassandra_bridge main.cpp cassandra_support.h) -add_dependencies(mqtt_cassandra_bridge cpp-driver) +# sm-mqtt-consumer +add_executable(sm-mqtt-consumer sm-mqtt-consumer.cpp cassandra_support.h) +add_dependencies(sm-mqtt-consumer cpp-driver) ## Boost -target_link_libraries(mqtt_cassandra_bridge PRIVATE ${Boost_LIBRARIES}) +target_link_libraries(sm-mqtt-consumer PRIVATE ${Boost_LIBRARIES}) ## Cassandra -target_include_directories(mqtt_cassandra_bridge PRIVATE ${CPP_DRIVER}/include) -target_link_libraries(mqtt_cassandra_bridge PRIVATE ${CPP_DRIVER}/lib/libcassandra.so) +target_include_directories(sm-mqtt-consumer PRIVATE ${CPP_DRIVER}/include) +target_link_libraries(sm-mqtt-consumer PRIVATE ${CPP_DRIVER}/lib/libcassandra.so) ## Mosquitto -target_compile_options(mqtt_cassandra_bridge PUBLIC ${SHARED_COMPILE_OPTIONS}) -target_link_libraries(mqtt_cassandra_bridge PRIVATE mosquitto mosquittopp) +target_compile_options(sm-mqtt-consumer PUBLIC ${SHARED_COMPILE_OPTIONS}) +target_link_libraries(sm-mqtt-consumer PRIVATE mosquitto mosquittopp) ## Ble toys -add_dependencies(mqtt_cassandra_bridge ble-toys) -target_include_directories(mqtt_cassandra_bridge PRIVATE ${BLE_TOYS}/include) -target_link_libraries(mqtt_cassandra_bridge PRIVATE ${BLE_TOYS}/lib/trygvis/libtrygvis-sensor.a) +add_dependencies(sm-mqtt-consumer ble-toys) +target_include_directories(sm-mqtt-consumer PRIVATE ${BLE_TOYS}/include) +target_link_libraries(sm-mqtt-consumer PRIVATE ${BLE_TOYS}/lib/trygvis/libtrygvis-sensor.a) -# sm_web_server -add_executable(sm_web_server sm_web_server.cpp cassandra_support.h http_support.h) -target_compile_options(sm_web_server PUBLIC ${SHARED_COMPILE_OPTIONS}) +# sm-http-server +add_executable(sm-http-server sm-http-server.cpp cassandra_support.h http_support.h) +target_compile_options(sm-http-server PUBLIC ${SHARED_COMPILE_OPTIONS}) ## Boost -target_link_libraries(sm_web_server PRIVATE ${Boost_LIBRARIES}) +target_link_libraries(sm-http-server PRIVATE ${Boost_LIBRARIES}) ## Cassandra -add_dependencies(sm_web_server cpp-driver) -target_include_directories(sm_web_server PRIVATE ${CPP_DRIVER}/include) -target_link_libraries(sm_web_server PRIVATE ${CPP_DRIVER}/lib/libcassandra.so) +add_dependencies(sm-http-server cpp-driver) +target_include_directories(sm-http-server PRIVATE ${CPP_DRIVER}/include) +target_link_libraries(sm-http-server PRIVATE ${CPP_DRIVER}/lib/libcassandra.so) ## Nghttp2 -add_dependencies(sm_web_server nghttp2) -target_include_directories(sm_web_server PRIVATE ${NGHTTP2}/include) -target_link_libraries(sm_web_server PRIVATE ${NGHTTP2}/lib/libnghttp2_asio.a ${NGHTTP2}/lib/libnghttp2.a) +add_dependencies(sm-http-server nghttp2) +target_include_directories(sm-http-server PRIVATE ${NGHTTP2}/include) +target_link_libraries(sm-http-server PRIVATE ${NGHTTP2}/lib/libnghttp2_asio.a ${NGHTTP2}/lib/libnghttp2.a) ## Misc -target_link_libraries(sm_web_server PRIVATE ssl crypto pthread) +target_link_libraries(sm-http-server PRIVATE ssl crypto pthread) enable_testing() add_executable(http-tests http-tests.cpp http_support.h) diff --git a/sm_web_server.cpp b/sm-http-server.cpp index 7ac4e67..7ac4e67 100644 --- a/sm_web_server.cpp +++ b/sm-http-server.cpp diff --git a/main.cpp b/sm-mqtt-consumer.cpp index d7dbfdc..d7dbfdc 100644 --- a/main.cpp +++ b/sm-mqtt-consumer.cpp |