diff --git a/CMakeLists.txt b/CMakeLists.txt index 38d9df94..c155dc24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,20 +135,27 @@ option(WITH_APPS "Build apps?" ON) option(WITH_PLUGINS "Build plugins?" ON) option(WITH_DOCS "Build documentation?" ON) -add_library(config-header INTERFACE) -target_sources(config-header INTERFACE config.h) -target_include_directories(config-header +target_sources(common-options INTERFACE config.h) +target_include_directories(common-options INTERFACE ${mosquitto_SOURCE_DIR} + ${mosquitto_SOURCE_DIR}/include ) if(WITH_TLS) - target_include_directories(config-header + target_include_directories(common-options INTERFACE "${OPENSSL_INCLUDE_DIR}" ) endif() +if(WITH_BUNDLED_DEPS) + target_include_directories(common-options + INTERFACE + "${mosquitto_SOURCE_DIR}/deps" + ) +endif() + add_subdirectory(libcommon) add_subdirectory(lib) diff --git a/apps/db_dump/CMakeLists.txt b/apps/db_dump/CMakeLists.txt index 256aaa16..fca8f1bc 100644 --- a/apps/db_dump/CMakeLists.txt +++ b/apps/db_dump/CMakeLists.txt @@ -22,9 +22,7 @@ target_compile_definitions(mosquitto_db_dump PRIVATE ) target_include_directories(mosquitto_db_dump PRIVATE - "${mosquitto_SOURCE_DIR}" "${mosquitto_SOURCE_DIR}/common" - "${mosquitto_SOURCE_DIR}/include" "${mosquitto_SOURCE_DIR}/lib" "${mosquitto_SOURCE_DIR}/libcommon" "${mosquitto_SOURCE_DIR}/src" @@ -32,21 +30,15 @@ target_include_directories(mosquitto_db_dump PRIVATE "${CJSON_INCLUDE_DIRS}" ) -if(WITH_BUNDLED_DEPS) - target_include_directories(mosquitto_db_dump PRIVATE - "${mosquitto_SOURCE_DIR}/deps" - ) -endif() - if(WITH_TLS) - target_link_libraries(mosquitto_db_dump PRIVATE config-header OpenSSL::SSL) + target_link_libraries(mosquitto_db_dump PRIVATE OpenSSL::SSL) endif() if(WIN32) target_link_libraries(mosquitto_db_dump PRIVATE ws2_32) endif() -target_link_libraries(mosquitto_db_dump PRIVATE libmosquitto_common) +target_link_libraries(mosquitto_db_dump PRIVATE common-options libmosquitto_common) install(TARGETS mosquitto_db_dump RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt index c11db3c9..37a2b04c 100644 --- a/apps/mosquitto_ctrl/CMakeLists.txt +++ b/apps/mosquitto_ctrl/CMakeLists.txt @@ -54,7 +54,6 @@ if(WITH_TLS) add_executable(mosquitto_ctrl ${SRC}) target_include_directories(mosquitto_ctrl PRIVATE - "${mosquitto_SOURCE_DIR}" "${mosquitto_SOURCE_DIR}/apps/mosquitto_passwd" "${mosquitto_SOURCE_DIR}/common" "${mosquitto_SOURCE_DIR}/plugins/common" @@ -62,11 +61,6 @@ if(WITH_TLS) "${ARGON2_INCLUDE_DIRS}" "${CJSON_INCLUDE_DIRS}" ) - if(WITH_BUNDLED_DEPS) - target_include_directories(mosquitto_ctrl PRIVATE - "${mosquitto_SOURCE_DIR}/deps" - ) - endif() if(WITH_CTRL_SHELL AND LINEEDITING_FOUND) target_compile_definitions(mosquitto_ctrl PRIVATE WITH_CTRL_SHELL) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 6611279c..1b7e0723 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -5,7 +5,6 @@ target_link_libraries(client-common INTERFACE common-options) target_include_directories(client-common INTERFACE "${CJSON_INCLUDE_DIRS}" "${OPENSSL_INCLUDE_DIR}" - "${mosquitto_SOURCE_DIR}" ) target_sources(client-common INTERFACE ${shared_src}) @@ -34,11 +33,6 @@ if (WITH_THREADING AND NOT WIN32) target_link_libraries(client-common INTERFACE Threads::Threads) endif() -if(WITH_BUNDLED_DEPS) - target_include_directories(mosquitto_sub PRIVATE "${mosquitto_SOURCE_DIR}/deps") - target_include_directories(mosquitto_rr PRIVATE "${mosquitto_SOURCE_DIR}/deps") -endif() - if(CJSON_FOUND) target_link_libraries(client-common INTERFACE cJSON) endif() diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4585a51a..acbdde28 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -95,18 +95,11 @@ target_include_directories(libmosquitto "${mosquitto_SOURCE_DIR}/include" "${mosquitto_SOURCE_DIR}/lib" PRIVATE - "${mosquitto_SOURCE_DIR}" "${mosquitto_SOURCE_DIR}/common" "${mosquitto_SOURCE_DIR}/libcommon" "${OPENSSL_INCLUDE_DIR}" # Required for cross compilation ) -if(WITH_BUNDLED_DEPS) - target_include_directories(libmosquitto PRIVATE - "${mosquitto_SOURCE_DIR}/deps" - ) -endif() - if(WITH_THREADING) if(WIN32) set (LIBRARIES ${LIBRARIES} PThreads4W::PThreads4W) diff --git a/libcommon/CMakeLists.txt b/libcommon/CMakeLists.txt index 8f3474a0..8d815566 100644 --- a/libcommon/CMakeLists.txt +++ b/libcommon/CMakeLists.txt @@ -37,14 +37,12 @@ endif() target_include_directories(libmosquitto_common PUBLIC - "${mosquitto_SOURCE_DIR}/" - "${mosquitto_SOURCE_DIR}/include" "${CJSON_INCLUDE_DIRS}" ) target_link_libraries(libmosquitto_common PUBLIC - config-header + common-options cJSON ) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 1aeca77e..a2175b99 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -6,9 +6,6 @@ function(add_mosquitto_plugin_no_install PLUGIN_NAME SRCLIST INCLIST LINKLIST) "${mosquitto_SOURCE_DIR}/common" "${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 "" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 685bb3e4..96d5c000 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -277,15 +277,9 @@ target_include_directories(mosquitto "${mosquitto_SOURCE_DIR}/src" "${CJSON_INCLUDE_DIRS}" ) -if(WITH_BUNDLED_DEPS) - target_include_directories(mosquitto PRIVATE - "${mosquitto_SOURCE_DIR}/deps" - ) -endif() target_link_libraries(mosquitto PUBLIC - config-header libmosquitto_common PRIVATE common-options diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 58be72d3..fe8490a8 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -13,7 +13,6 @@ target_include_directories(common-unit-test-header target_link_libraries(common-unit-test-header INTERFACE common-options - config-header CUnit::CUnit )