Merge pull request #18 from fengzeroz/main

refactor dependent libs
This commit is contained in:
fengzeroz
2021-08-11 09:29:08 +08:00
committed by GitHub
3 changed files with 6 additions and 5 deletions
+3 -2
View File
@@ -73,7 +73,7 @@ if(APPLE)
else()
target_link_libraries(neuron dl nng jansson neuron-base)
endif()
target_link_libraries(neuron ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(neuron ssl crypto ${CMAKE_THREAD_LIBS_INIT})
# define neuron base library
set(NEURON_BASE_SOURCES
@@ -91,7 +91,7 @@ add_library(neuron-base SHARED)
target_sources(neuron-base PRIVATE ${NEURON_BASE_SOURCES})
target_include_directories(neuron-base
PRIVATE ${NEURON_BASE_INCLUDE_DIRECTORIES})
target_link_libraries(neuron-base paho-mqtt3as vector-static jansson ssl crypto ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(neuron-base vector-static jansson ${CMAKE_THREAD_LIBS_INIT})
# define for plugins
set(SAMPLE_PLUGIN_SOURCES plugins/plugin_sample.c)
@@ -100,6 +100,7 @@ target_sources(plugin-sample PRIVATE ${SAMPLE_PLUGIN_SOURCES})
target_include_directories(plugin-sample PRIVATE include)
target_link_libraries(plugin-sample neuron-base)
target_link_libraries(plugin-sample ${CMAKE_THREAD_LIBS_INIT})
add_subdirectory(plugins/mqtt)
enable_testing()
+2 -2
View File
@@ -1,8 +1,8 @@
find_package(eclipse-paho-mqtt-c 1.3.9 REQUIRED)
include_directories(../../include/)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}")
set(src plugin_mqtt.c paho_client.c)
add_library(plugin-mqtt SHARED ${src})
target_link_libraries(plugin-mqtt neuron-base pthread paho-mqtt3as ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(plugin-mqtt neuron-base paho-mqtt3as ssl crypto)
target_link_libraries(plugin-mqtt ${CMAKE_THREAD_LIBS_INIT})
+1 -1
View File
@@ -4,7 +4,7 @@ include_directories(../../../plugins/mqtt)
file(GLOB MQTT_SRC "../../../plugins/mqtt/*.c")
set(src ${MQTT_SRC} paho_client_test.cc)
add_executable(paho_client_test ${src})
target_link_libraries(paho_client_test neuron-base gtest gtest_main)
target_link_libraries(paho_client_test neuron-base gtest gtest_main paho-mqtt3as ssl crypto)
# add_test(
# NAME