From 0503d5d35c2ef354280910cab1d28335d01bd0f1 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 3 Nov 2022 15:50:42 +0000 Subject: [PATCH] Fix windows build --- plugins/examples/client-lifetime-stats/CMakeLists.txt | 7 ++++++- plugins/examples/payload-ban/CMakeLists.txt | 7 ++++++- plugins/examples/wildcard-temp/CMakeLists.txt | 3 +-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/plugins/examples/client-lifetime-stats/CMakeLists.txt b/plugins/examples/client-lifetime-stats/CMakeLists.txt index 663cb6e1..d124864e 100644 --- a/plugins/examples/client-lifetime-stats/CMakeLists.txt +++ b/plugins/examples/client-lifetime-stats/CMakeLists.txt @@ -5,10 +5,15 @@ add_library(${PLUGIN_NAME} MODULE ) target_include_directories(${PLUGIN_NAME} PRIVATE - "${mosquitto_SOURCE_DIR}/deps" "${mosquitto_SOURCE_DIR}/include" ) +if(WITH_BUNDLED_DEPS) + target_include_directories(${PLUGIN_NAME} PRIVATE + "${mosquitto_SOURCE_DIR}/deps" + ) +endif() + set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "" POSITION_INDEPENDENT_CODE 1 diff --git a/plugins/examples/payload-ban/CMakeLists.txt b/plugins/examples/payload-ban/CMakeLists.txt index ebaa61b9..d8665c91 100644 --- a/plugins/examples/payload-ban/CMakeLists.txt +++ b/plugins/examples/payload-ban/CMakeLists.txt @@ -8,9 +8,14 @@ target_include_directories(${PLUGIN_NAME} PRIVATE "${OPENSSL_INCLUDE_DIR}" "${mosquitto_SOURCE_DIR}" "${mosquitto_SOURCE_DIR}/include" - "${mosquitto_SOURCE_DIR}/deps" ) +if(WITH_BUNDLED_DEPS) + target_include_directories(${PLUGIN_NAME} PRIVATE + "${mosquitto_SOURCE_DIR}/deps" + ) +endif() + set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "" POSITION_INDEPENDENT_CODE 1 diff --git a/plugins/examples/wildcard-temp/CMakeLists.txt b/plugins/examples/wildcard-temp/CMakeLists.txt index 447e2583..8b6a0e20 100644 --- a/plugins/examples/wildcard-temp/CMakeLists.txt +++ b/plugins/examples/wildcard-temp/CMakeLists.txt @@ -6,13 +6,12 @@ add_library(${PLUGIN_NAME} MODULE target_include_directories(${PLUGIN_NAME} PRIVATE "${mosquitto_SOURCE_DIR}" - "${mosquitto_SOURCE_DIR}/deps" "${mosquitto_SOURCE_DIR}/include" ) if(WITH_BUNDLED_DEPS) target_include_directories(${PLUGIN_NAME} PRIVATE - "${${PLUGIN_NAME}}/deps" + "${mosquitto_SOURCE_DIR}/deps" ) endif()