From 340c4f323fe3d1bcf702700e1623e83277feacf0 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Tue, 5 Mar 2024 09:36:15 +0000
Subject: [PATCH] Rename cmake helper functions.

---
 plugins/CMakeLists.txt                                 | 6 +++---
 plugins/dynamic-security/CMakeLists.txt                | 2 +-
 plugins/examples/add-properties/CMakeLists.txt         | 2 +-
 plugins/examples/auth-by-env/CMakeLists.txt            | 2 +-
 plugins/examples/auth-by-ip/CMakeLists.txt             | 2 +-
 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/deny-protocol-version/CMakeLists.txt  | 2 +-
 plugins/examples/force-retain/CMakeLists.txt           | 2 +-
 plugins/examples/limit-subscription-qos/CMakeLists.txt | 2 +-
 plugins/examples/message-timestamp/CMakeLists.txt      | 2 +-
 plugins/examples/payload-ban/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-jail/CMakeLists.txt             | 2 +-
 plugins/examples/topic-modification/CMakeLists.txt     | 2 +-
 plugins/examples/wildcard-temp/CMakeLists.txt          | 2 +-
 plugins/persist-sqlite/CMakeLists.txt                  | 2 +-
 plugins/sparkplug-aware/CMakeLists.txt                 | 2 +-
 23 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index bed0c1cb..43b1857c 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
-function(plugin_helper_no_install PLUGIN_NAME SRCLIST INCLIST LINKLIST)
+function(add_mosquitto_plugin_no_install PLUGIN_NAME SRCLIST INCLIST LINKLIST)
 	add_library(${PLUGIN_NAME} MODULE ${SRCLIST})
 	target_include_directories(${PLUGIN_NAME} PRIVATE
 		${INCLIST}
@@ -22,8 +22,8 @@ function(plugin_helper_no_install PLUGIN_NAME SRCLIST INCLIST LINKLIST)
 	)
 endfunction()
 
-function(plugin_helper PLUGIN_NAME SRCLIST INCLIST LINKLIST)
-	plugin_helper_no_install("${PLUGIN_NAME}" "${SRCLIST}" "${INCLIST}" "${LINKLIST}")
+function(add_mosquitto_plugin PLUGIN_NAME SRCLIST INCLIST LINKLIST)
+	add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${SRCLIST}" "${INCLIST}" "${LINKLIST}")
 
 	if(WIN32)
 		install(TARGETS ${PLUGIN_NAME}
diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt
index 37ecb3fe..d99dabfc 100644
--- a/plugins/dynamic-security/CMakeLists.txt
+++ b/plugins/dynamic-security/CMakeLists.txt
@@ -35,5 +35,5 @@ if(WITH_TLS)
 		OpenSSL::SSL
 	)
 
-	plugin_helper("${PLUGIN_NAME}" "${SRCLIST}" "${INCLIST}" "${LINKLIST}")
+	add_mosquitto_plugin("${PLUGIN_NAME}" "${SRCLIST}" "${INCLIST}" "${LINKLIST}")
 endif()
diff --git a/plugins/examples/add-properties/CMakeLists.txt b/plugins/examples/add-properties/CMakeLists.txt
index 8193d669..5cee53bd 100644
--- a/plugins/examples/add-properties/CMakeLists.txt
+++ b/plugins/examples/add-properties/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_add_properties)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/auth-by-env/CMakeLists.txt b/plugins/examples/auth-by-env/CMakeLists.txt
index a4afe8cc..450db746 100644
--- a/plugins/examples/auth-by-env/CMakeLists.txt
+++ b/plugins/examples/auth-by-env/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_auth_by_env)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/auth-by-ip/CMakeLists.txt b/plugins/examples/auth-by-ip/CMakeLists.txt
index 96c07acf..b44b59c3 100644
--- a/plugins/examples/auth-by-ip/CMakeLists.txt
+++ b/plugins/examples/auth-by-ip/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_auth_by_ip)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/client-lifetime-stats/CMakeLists.txt b/plugins/examples/client-lifetime-stats/CMakeLists.txt
index ef8996c1..7a251cac 100644
--- a/plugins/examples/client-lifetime-stats/CMakeLists.txt
+++ b/plugins/examples/client-lifetime-stats/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_client_lifetime_stats)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/client-properties/CMakeLists.txt b/plugins/examples/client-properties/CMakeLists.txt
index 3ceefbec..52383f59 100644
--- a/plugins/examples/client-properties/CMakeLists.txt
+++ b/plugins/examples/client-properties/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_client_properties)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/connection-state/CMakeLists.txt b/plugins/examples/connection-state/CMakeLists.txt
index 769b198e..da690340 100644
--- a/plugins/examples/connection-state/CMakeLists.txt
+++ b/plugins/examples/connection-state/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_connection_state)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/delayed-auth/CMakeLists.txt b/plugins/examples/delayed-auth/CMakeLists.txt
index 7e1ed595..d6db3558 100644
--- a/plugins/examples/delayed-auth/CMakeLists.txt
+++ b/plugins/examples/delayed-auth/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_delayed_auth)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/deny-protocol-version/CMakeLists.txt b/plugins/examples/deny-protocol-version/CMakeLists.txt
index bb4a9c0c..4e551e57 100644
--- a/plugins/examples/deny-protocol-version/CMakeLists.txt
+++ b/plugins/examples/deny-protocol-version/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_deny_protocol_version)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/force-retain/CMakeLists.txt b/plugins/examples/force-retain/CMakeLists.txt
index e5b77cbb..666f5eb4 100644
--- a/plugins/examples/force-retain/CMakeLists.txt
+++ b/plugins/examples/force-retain/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_force_retain)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/limit-subscription-qos/CMakeLists.txt b/plugins/examples/limit-subscription-qos/CMakeLists.txt
index 7d8d2d7d..30b5574f 100644
--- a/plugins/examples/limit-subscription-qos/CMakeLists.txt
+++ b/plugins/examples/limit-subscription-qos/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_limit_subscription_qos)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/message-timestamp/CMakeLists.txt b/plugins/examples/message-timestamp/CMakeLists.txt
index efae18f5..21113793 100644
--- a/plugins/examples/message-timestamp/CMakeLists.txt
+++ b/plugins/examples/message-timestamp/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_message_timestamp)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/payload-ban/CMakeLists.txt b/plugins/examples/payload-ban/CMakeLists.txt
index d6603c2e..3ded5176 100644
--- a/plugins/examples/payload-ban/CMakeLists.txt
+++ b/plugins/examples/payload-ban/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_payload_ban)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/payload-modification/CMakeLists.txt b/plugins/examples/payload-modification/CMakeLists.txt
index ab0466a0..e8404b0d 100644
--- a/plugins/examples/payload-modification/CMakeLists.txt
+++ b/plugins/examples/payload-modification/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_payload_modification)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/payload-size-stats/CMakeLists.txt b/plugins/examples/payload-size-stats/CMakeLists.txt
index 993246db..0228d8ea 100644
--- a/plugins/examples/payload-size-stats/CMakeLists.txt
+++ b/plugins/examples/payload-size-stats/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_payload_size_stats)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/plugin-event-stats/CMakeLists.txt b/plugins/examples/plugin-event-stats/CMakeLists.txt
index 038ea17d..6b026e96 100644
--- a/plugins/examples/plugin-event-stats/CMakeLists.txt
+++ b/plugins/examples/plugin-event-stats/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_plugin_event_stats)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/print-ip-on-publish/CMakeLists.txt b/plugins/examples/print-ip-on-publish/CMakeLists.txt
index 441f6b3d..fcc689f0 100644
--- a/plugins/examples/print-ip-on-publish/CMakeLists.txt
+++ b/plugins/examples/print-ip-on-publish/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_print_ip_on_publish)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/topic-jail/CMakeLists.txt b/plugins/examples/topic-jail/CMakeLists.txt
index 46032b6c..69df9daa 100644
--- a/plugins/examples/topic-jail/CMakeLists.txt
+++ b/plugins/examples/topic-jail/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_topic_jail)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/topic-modification/CMakeLists.txt b/plugins/examples/topic-modification/CMakeLists.txt
index 78d5ca1b..14aeebdb 100644
--- a/plugins/examples/topic-modification/CMakeLists.txt
+++ b/plugins/examples/topic-modification/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_topic_modification)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/examples/wildcard-temp/CMakeLists.txt b/plugins/examples/wildcard-temp/CMakeLists.txt
index 9f0d005d..6e441ea8 100644
--- a/plugins/examples/wildcard-temp/CMakeLists.txt
+++ b/plugins/examples/wildcard-temp/CMakeLists.txt
@@ -1,3 +1,3 @@
 set (PLUGIN_NAME mosquitto_wildcard_temp)
 
-plugin_helper_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
+add_mosquitto_plugin_no_install("${PLUGIN_NAME}" "${PLUGIN_NAME}.c" "" "")
diff --git a/plugins/persist-sqlite/CMakeLists.txt b/plugins/persist-sqlite/CMakeLists.txt
index df7e3399..69f7517e 100644
--- a/plugins/persist-sqlite/CMakeLists.txt
+++ b/plugins/persist-sqlite/CMakeLists.txt
@@ -22,5 +22,5 @@ if(SQLITE3_FOUND)
 		SQLite::SQLite3
 	)
 
-	plugin_helper("${PLUGIN_NAME}" "${SRCLIST}" "${INCLIST}" "${LINKLIST}")
+	add_mosquitto_plugin("${PLUGIN_NAME}" "${SRCLIST}" "${INCLIST}" "${LINKLIST}")
 endif()
diff --git a/plugins/sparkplug-aware/CMakeLists.txt b/plugins/sparkplug-aware/CMakeLists.txt
index 3bdac8d7..358eda3e 100644
--- a/plugins/sparkplug-aware/CMakeLists.txt
+++ b/plugins/sparkplug-aware/CMakeLists.txt
@@ -8,4 +8,4 @@ set(SRCLIST
 set(INCLIST )
 set(LINKLIST )
 
-plugin_helper("${PLUGIN_NAME}" "${SRCLIST}" "${INCLIST}" "${LINKLIST}")
+add_mosquitto_plugin("${PLUGIN_NAME}" "${SRCLIST}" "${INCLIST}" "${LINKLIST}")