nicolabs/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-04-24 02:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make required includes public for libmosquitto

Browse source 
for simplified usage of the CMake target

Issue number: #2452

Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>
This commit is contained in:
Kai Buschulte 2022-08-08 09:52:23 +00:00
parent 8b67883548
commit ddd16d54be
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/mosquitto_ctrl/CMakeLists.txt
View file

@ -20,11 +20,8 @@ if(WITH_TLS AND CJSON_FOUND)
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/apps/mosquitto_passwd"
"${mosquitto_SOURCE_DIR}/common"
"${mosquitto_SOURCE_DIR}/include"
"${mosquitto_SOURCE_DIR}/lib"
"${mosquitto_SOURCE_DIR}/plugins/common"
"${mosquitto_SOURCE_DIR}/plugins/dynamic-security"
"${mosquitto_SOURCE_DIR}/src"
)
if(WITH_BUNDLED_DEPS)
target_include_directories(mosquitto_ctrl PRIVATE

11
client/CMakeLists.txt
View file

@ -1,14 +1,11 @@
set(shared_src client_shared.c client_shared.h client_props.c)
set(CLIENT_INC
"${OPENSSL_INCLUDE_DIR}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
)
add_library(client-common INTERFACE)
target_link_libraries(client-common INTERFACE common-options)
target_include_directories(client-common INTERFACE ${CLIENT_INC})
target_include_directories(client-common INTERFACE
"${OPENSSL_INCLUDE_DIR}"
"${mosquitto_SOURCE_DIR}"
)
target_sources(client-common INTERFACE ${shared_src})
if(WITH_SRV)

2
lib/CMakeLists.txt
View file

@ -108,10 +108,10 @@ endif()
target_include_directories(libmosquitto
PUBLIC
"${mosquitto_SOURCE_DIR}/include"
"${mosquitto_SOURCE_DIR}/lib"
PRIVATE
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/common"
"${mosquitto_SOURCE_DIR}/lib"
)
if(WITH_BUNDLED_DEPS)

8
lib/cpp/CMakeLists.txt
View file

@ -10,13 +10,13 @@ set_target_properties(mosquittopp PROPERTIES
target_include_directories(mosquittopp
PUBLIC
"${mosquitto_SOURCE_DIR}/include"
PRIVATE
"${mosquitto_SOURCE_DIR}/lib"
"${mosquitto_SOURCE_DIR}/lib/cpp"
)
target_link_libraries(mosquittopp PRIVATE libmosquitto common-options)
target_link_libraries(mosquittopp
PUBLIC libmosquitto
PRIVATE common-options
)
if (WITH_THREADING AND NOT WIN32)
set(THREADS_PREFER_PTHREAD_FLAG ON)