From 8b6788354803d32f230f8757d4ee583f8c53c475 Mon Sep 17 00:00:00 2001 From: Kai Buschulte Date: Mon, 8 Aug 2022 09:23:08 +0000 Subject: [PATCH] Remove old compatibility header support Signed-off-by: Kai Buschulte --- apps/mosquitto_ctrl/CMakeLists.txt | 2 -- apps/mosquitto_passwd/CMakeLists.txt | 2 -- client/CMakeLists.txt | 2 -- lib/CMakeLists.txt | 4 ---- lib/cpp/CMakeLists.txt | 4 ---- plugins/dynamic-security/CMakeLists.txt | 2 -- plugins/examples/add-properties/CMakeLists.txt | 2 -- plugins/examples/auth-by-ip/CMakeLists.txt | 1 - plugins/examples/client-lifetime-stats/CMakeLists.txt | 2 -- plugins/examples/client-properties/CMakeLists.txt | 2 -- plugins/examples/connection-state/CMakeLists.txt | 2 -- plugins/examples/delayed-auth/CMakeLists.txt | 2 -- plugins/examples/force-retain/CMakeLists.txt | 2 -- plugins/examples/message-timestamp/CMakeLists.txt | 2 -- plugins/examples/payload-modification/CMakeLists.txt | 2 -- plugins/examples/payload-size-stats/CMakeLists.txt | 2 -- plugins/examples/plugin-event-stats/CMakeLists.txt | 2 -- plugins/examples/print-ip-on-publish/CMakeLists.txt | 2 -- plugins/examples/topic-modification/CMakeLists.txt | 2 -- plugins/examples/wildcard-temp/CMakeLists.txt | 2 -- plugins/persist-sqlite/CMakeLists.txt | 2 -- src/CMakeLists.txt | 2 -- 22 files changed, 47 deletions(-) diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt index d3629a79..c44f53bb 100644 --- a/apps/mosquitto_ctrl/CMakeLists.txt +++ b/apps/mosquitto_ctrl/CMakeLists.txt @@ -17,8 +17,6 @@ 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" diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt index baa0bc4c..70432e9c 100644 --- a/apps/mosquitto_passwd/CMakeLists.txt +++ b/apps/mosquitto_passwd/CMakeLists.txt @@ -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" diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 113fe66e..35930a20 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -2,8 +2,6 @@ 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" ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index a33fbaa4..0ee40291 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -109,8 +109,6 @@ target_include_directories(libmosquitto PUBLIC "${mosquitto_SOURCE_DIR}/include" PRIVATE - "${STDBOOL_H_PATH}" - "${STDINT_H_PATH}" "${mosquitto_SOURCE_DIR}" "${mosquitto_SOURCE_DIR}/common" "${mosquitto_SOURCE_DIR}/lib" @@ -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" diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index 51359ed2..e8a59f0e 100644 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt @@ -12,8 +12,6 @@ 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" ) @@ -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" diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt index 163e48b4..ef40fd11 100644 --- a/plugins/dynamic-security/CMakeLists.txt +++ b/plugins/dynamic-security/CMakeLists.txt @@ -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" diff --git a/plugins/examples/add-properties/CMakeLists.txt b/plugins/examples/add-properties/CMakeLists.txt index 3f6c689b..78a11d1a 100644 --- a/plugins/examples/add-properties/CMakeLists.txt +++ b/plugins/examples/add-properties/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/auth-by-ip/CMakeLists.txt b/plugins/examples/auth-by-ip/CMakeLists.txt index 340c2429..f0f6d22e 100644 --- a/plugins/examples/auth-by-ip/CMakeLists.txt +++ b/plugins/examples/auth-by-ip/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/client-lifetime-stats/CMakeLists.txt b/plugins/examples/client-lifetime-stats/CMakeLists.txt index bfd43fef..663cb6e1 100644 --- a/plugins/examples/client-lifetime-stats/CMakeLists.txt +++ b/plugins/examples/client-lifetime-stats/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/client-properties/CMakeLists.txt b/plugins/examples/client-properties/CMakeLists.txt index 7b262bff..b58cb806 100644 --- a/plugins/examples/client-properties/CMakeLists.txt +++ b/plugins/examples/client-properties/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/connection-state/CMakeLists.txt b/plugins/examples/connection-state/CMakeLists.txt index 3a6f4996..c1e98b0e 100644 --- a/plugins/examples/connection-state/CMakeLists.txt +++ b/plugins/examples/connection-state/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/delayed-auth/CMakeLists.txt b/plugins/examples/delayed-auth/CMakeLists.txt index 903db900..03773a36 100644 --- a/plugins/examples/delayed-auth/CMakeLists.txt +++ b/plugins/examples/delayed-auth/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/force-retain/CMakeLists.txt b/plugins/examples/force-retain/CMakeLists.txt index d4d872ef..13c4826e 100644 --- a/plugins/examples/force-retain/CMakeLists.txt +++ b/plugins/examples/force-retain/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/message-timestamp/CMakeLists.txt b/plugins/examples/message-timestamp/CMakeLists.txt index ad74d786..a212fd11 100644 --- a/plugins/examples/message-timestamp/CMakeLists.txt +++ b/plugins/examples/message-timestamp/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/payload-modification/CMakeLists.txt b/plugins/examples/payload-modification/CMakeLists.txt index 0c9ad1c1..2530cf47 100644 --- a/plugins/examples/payload-modification/CMakeLists.txt +++ b/plugins/examples/payload-modification/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/payload-size-stats/CMakeLists.txt b/plugins/examples/payload-size-stats/CMakeLists.txt index 32dd35da..49a07b1a 100644 --- a/plugins/examples/payload-size-stats/CMakeLists.txt +++ b/plugins/examples/payload-size-stats/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/plugin-event-stats/CMakeLists.txt b/plugins/examples/plugin-event-stats/CMakeLists.txt index 316fde29..32c1c0e0 100644 --- a/plugins/examples/plugin-event-stats/CMakeLists.txt +++ b/plugins/examples/plugin-event-stats/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/print-ip-on-publish/CMakeLists.txt b/plugins/examples/print-ip-on-publish/CMakeLists.txt index 2b01eb3e..23175017 100644 --- a/plugins/examples/print-ip-on-publish/CMakeLists.txt +++ b/plugins/examples/print-ip-on-publish/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/topic-modification/CMakeLists.txt b/plugins/examples/topic-modification/CMakeLists.txt index 1063ddee..a95b1d45 100644 --- a/plugins/examples/topic-modification/CMakeLists.txt +++ b/plugins/examples/topic-modification/CMakeLists.txt @@ -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" ) diff --git a/plugins/examples/wildcard-temp/CMakeLists.txt b/plugins/examples/wildcard-temp/CMakeLists.txt index ff41a8a8..447e2583 100644 --- a/plugins/examples/wildcard-temp/CMakeLists.txt +++ b/plugins/examples/wildcard-temp/CMakeLists.txt @@ -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" diff --git a/plugins/persist-sqlite/CMakeLists.txt b/plugins/persist-sqlite/CMakeLists.txt index 7e0adb22..043bde32 100644 --- a/plugins/persist-sqlite/CMakeLists.txt +++ b/plugins/persist-sqlite/CMakeLists.txt @@ -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" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0138dc5a..ec44fbbf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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"