Skip to content

Updating CMakeLists.txt and adding missing include directive in mqtt_… #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updating CMakeLists.txt and adding missing include directive in mqtt_… #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions human_experiments/lab_software/mqtt_to_lsl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,8 @@ find_package(
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/../../../tools/cmake")
find_package(Mosquitto REQUIRED)
find_package(Threads REQUIRED)

message(STATUS ${LSL_DIR})

set(_libs
nlohmann_json::nlohmann_json
fmt::fmt
${Mosquitto_LIBRARIES}
LSL::lsl
${Boost_LIBRARIES})

add_subdirectory(src)
15 changes: 11 additions & 4 deletions human_experiments/lab_software/mqtt_to_lsl/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@ file(GLOB_RECURSE project_sources CONFIGURE_DEPENDS
${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)

add_library(project_static_lib STATIC ${project_sources})
target_include_directories(project_static_lib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LSL_INCLUDE_DIR} ${Mosquitto_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
set(_all_libs ${_libs} project_static_lib)
target_include_directories(
project_static_lib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LSL_INCLUDE_DIR} ${Mosquitto_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
target_link_libraries(
project_static_lib
PRIVATE
${Mosquitto_LIBRARIES}
LSL::lsl
${Boost_LIBRARIES}
)

add_executable(minecraft_mqtt_to_lsl minecraft_mqtt_to_lsl.cpp)
target_include_directories(minecraft_mqtt_to_lsl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(minecraft_mqtt_to_lsl PRIVATE ${_all_libs})
target_link_libraries(minecraft_mqtt_to_lsl PRIVATE project_static_lib fmt::fmt)

add_executable(publish_dummy publish_dummy.cpp)
target_include_directories(publish_dummy PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(publish_dummy PRIVATE ${_all_libs})
target_link_libraries(publish_dummy PRIVATE project_static_lib fmt::fmt)
1 change: 1 addition & 0 deletions human_experiments/lab_software/mqtt_to_lsl/src/consumer/MinecraftMQTT2LSL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "MinecraftMQTT2LSL.h"

#include <iostream>
#include <memory>

#include <fmt/format.h>
#include <nlohmann/json.hpp>
Expand Down
1 change: 1 addition & 0 deletions human_experiments/lab_software/mqtt_to_lsl/src/data_stream/LSLStringStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <string>
#include <memory>

#include <lsl_cpp.h>
#include <mosquitto.h>
Expand Down
1 change: 1 addition & 0 deletions human_experiments/lab_software/mqtt_to_lsl/src/data_stream/Mosquitto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

#include <string>
#include <thread>
#include <functional>

#include <mosquitto.h>

Expand Down