Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-08-23 06:58:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cmake-libmosq-public-include' of https://github.com/buschulte/mosquitto into buschulte-cmake-libmosq-public-include

Browse Source
This commit is contained in:
Roger A. Light
2022-08-11 09:29:21 +01:00
parent 7c295286ac ddd16d54be
commit bf61615075
22 changed files with 9 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mosquitto_ctrl/CMakeLists.txt
-5
View File
@@ -17,16 +17,11 @@ if(WITH_TLS AND CJSON_FOUND)
)
target_include_directories(mosquitto_ctrl PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${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
apps/mosquitto_passwd/CMakeLists.txt
-2
View File
@@ -10,8 +10,6 @@ if(WITH_TLS)
)
target_include_directories(mosquitto_passwd PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/common"
"${mosquitto_SOURCE_DIR}/include"
client/CMakeLists.txt
+4 -9
View File
@@ -1,16 +1,11 @@
set(shared_src client_shared.c client_shared.h client_props.c)
set(CLIENT_INC
"${OPENSSL_INCLUDE_DIR}"
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${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)
lib/CMakeLists.txt
+1 -5
View File
@@ -108,12 +108,10 @@ endif()
target_include_directories(libmosquitto
PUBLIC
"${mosquitto_SOURCE_DIR}/include"
"${mosquitto_SOURCE_DIR}/lib"
PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/common"
"${mosquitto_SOURCE_DIR}/lib"
)
if(WITH_BUNDLED_DEPS)
@@ -155,8 +153,6 @@ if(WITH_STATIC_LIBRARIES)
target_link_libraries(libmosquitto_static PRIVATE ${LIBRARIES})
target_include_directories(libmosquitto_static PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
"${mosquitto_SOURCE_DIR}/lib"
lib/cpp/CMakeLists.txt
+4 -8
View File
@@ -10,15 +10,13 @@ set_target_properties(mosquittopp PROPERTIES
target_include_directories(mosquittopp
PUBLIC
"${mosquitto_SOURCE_DIR}/include"
PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${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)
@@ -49,8 +47,6 @@ if(WITH_STATIC_LIBRARIES)
endif()
target_include_directories(mosquittopp_static PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/include"
"${mosquitto_SOURCE_DIR}/lib"
"${mosquitto_SOURCE_DIR}/lib/cpp"
plugins/dynamic-security/CMakeLists.txt
-2
View File
@@ -1,8 +1,6 @@
if(CJSON_FOUND AND WITH_TLS)
set(CLIENT_INC
"${CJSON_INCLUDE_DIRS}"
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/common"
"${mosquitto_SOURCE_DIR}/deps"
plugins/examples/add-properties/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/auth-by-ip/CMakeLists.txt
-1
View File
@@ -6,7 +6,6 @@ add_library(${PLUGIN_NAME} MODULE
target_include_directories(${PLUGIN_NAME} PRIVATE
"${OPENSSL_INCLUDE_DIR}"
"${STDBOOL_H_PATH} ${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/client-lifetime-stats/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/deps"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/client-properties/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/connection-state/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/delayed-auth/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/force-retain/CMakeLists.txt
-2
View File
@@ -6,8 +6,6 @@ add_library(${PLUGIN_NAME} MODULE
target_include_directories(${PLUGIN_NAME} PRIVATE
"${OPENSSL_INCLUDE_DIR}"
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/message-timestamp/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/payload-modification/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/payload-size-stats/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/plugin-event-stats/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/print-ip-on-publish/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/topic-modification/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/include"
)
plugins/examples/wildcard-temp/CMakeLists.txt
-2
View File
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
)
target_include_directories(${PLUGIN_NAME} PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/deps"
"${mosquitto_SOURCE_DIR}/include"
plugins/persist-sqlite/CMakeLists.txt
-2
View File
@@ -1,7 +1,5 @@
if(SQLITE3_FOUND AND CJSON_FOUND)
set(CLIENT_INC
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/deps"
"${mosquitto_SOURCE_DIR}/include"
"${mosquitto_SOURCE_DIR}/src"
src/CMakeLists.txt
-2
View File
@@ -228,8 +228,6 @@ target_include_directories(mosquitto
PUBLIC
"${mosquitto_SOURCE_DIR}/include"
PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}/common"
"${mosquitto_SOURCE_DIR}/lib"
"${mosquitto_SOURCE_DIR}/src"