From 89733138bb2e1d6eb558541fa996a75a8a48aeb7 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Tue, 13 Oct 2020 15:52:01 +0100 Subject: [PATCH] CMake build fixes. --- CMakeLists.txt | 3 +++ apps/CMakeLists.txt | 1 + apps/mosquitto_passwd/CMakeLists.txt | 16 ++++++++++++++++ client/CMakeLists.txt | 2 +- lib/CMakeLists.txt | 3 ++- lib/cpp/CMakeLists.txt | 1 + plugins/CMakeLists.txt | 1 + plugins/message-timestamp/CMakeLists.txt | 10 ++++++++++ ...timestamp.c => mosquitto_message_timestamp.c} | 0 src/CMakeLists.txt | 13 ++++--------- 10 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 apps/CMakeLists.txt create mode 100644 apps/mosquitto_passwd/CMakeLists.txt create mode 100644 plugins/CMakeLists.txt create mode 100644 plugins/message-timestamp/CMakeLists.txt rename plugins/message-timestamp/{mosquitto_timestamp.c => mosquitto_message_timestamp.c} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f0870bf..3462e3f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,9 @@ if (WITH_BROKER) add_subdirectory(src) endif (WITH_BROKER) +add_subdirectory(apps) +add_subdirectory(plugins) + if (DOCUMENTATION) add_subdirectory(man) endif (DOCUMENTATION) diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt new file mode 100644 index 00000000..d2e6ce83 --- /dev/null +++ b/apps/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(mosquitto_passwd) diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt new file mode 100644 index 00000000..82a33de8 --- /dev/null +++ b/apps/mosquitto_passwd/CMakeLists.txt @@ -0,0 +1,16 @@ +include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include + ${mosquitto_SOURCE_DIR}/lib ${mosquitto_SOURCE_DIR}/src + ${OPENSSL_INCLUDE_DIR} ${STDBOOL_H_PATH} ${STDINT_H_PATH}) + +if (WITH_TLS) + add_executable(mosquitto_passwd + mosquitto_passwd.c + ../../lib/memory_mosq.c ../../lib/memory_mosq.h + ../../lib/misc_mosq.c + ../../src/password_mosq.c ../../src/password_mosq.h + ) + + + target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) + install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") +endif (WITH_TLS) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index adb9c897..08506f31 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -6,7 +6,7 @@ if (WITH_SRV) add_definitions("-DWITH_SRV") endif (WITH_SRV) -set( CLIENT_INC ${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib +set( CLIENT_INC ${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include ${STDBOOL_H_PATH} ${STDINT_H_PATH} ${PTHREAD_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR}) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 67b1359e..ad5e69b9 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -4,12 +4,13 @@ if (WITH_LIB_CPP) endif (WITH_LIB_CPP) include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib + ${mosquitto_SOURCE_DIR}/include ${STDBOOL_H_PATH} ${STDINT_H_PATH} ${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR}) link_directories(${mosquitto_SOURCE_DIR}/lib) if (WITH_BUNDLED_DEPS) - include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps) + include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/deps) endif (WITH_BUNDLED_DEPS) set(C_SRC diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index b39ac3f5..1748b14c 100644 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt @@ -1,4 +1,5 @@ include_directories(${mosquitto_SOURCE_DIR}/lib ${mosquitto_SOURCE_DIR}/lib/cpp + ${mosquitto_SOURCE_DIR}/include ${STDBOOL_H_PATH} ${STDINT_H_PATH}) link_directories(${mosquitto_BINARY_DIR}/lib) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt new file mode 100644 index 00000000..6c3b3542 --- /dev/null +++ b/plugins/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(message-timestamp) diff --git a/plugins/message-timestamp/CMakeLists.txt b/plugins/message-timestamp/CMakeLists.txt new file mode 100644 index 00000000..542eeb32 --- /dev/null +++ b/plugins/message-timestamp/CMakeLists.txt @@ -0,0 +1,10 @@ +include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/include + ${STDBOOL_H_PATH} ${STDINT_H_PATH}) + +add_library(mosquitto_message_timestamp SHARED mosquitto_message_timestamp.c) +set_target_properties(mosquitto_message_timestamp PROPERTIES + POSITION_INDEPENDENT_CODE 1 +) +set_target_properties(mosquitto_message_timestamp PROPERTIES PREFIX "") + +install(TARGETS mosquitto_message_timestamp RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/plugins/message-timestamp/mosquitto_timestamp.c b/plugins/message-timestamp/mosquitto_message_timestamp.c similarity index 100% rename from plugins/message-timestamp/mosquitto_timestamp.c rename to plugins/message-timestamp/mosquitto_message_timestamp.c diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fd69b347..92c18b54 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src - ${mosquitto_SOURCE_DIR}/lib ${OPENSSL_INCLUDE_DIR} - ${STDBOOL_H_PATH} ${STDINT_H_PATH}) + ${mosquitto_SOURCE_DIR}/include ${mosquitto_SOURCE_DIR}/lib + ${OPENSSL_INCLUDE_DIR} ${STDBOOL_H_PATH} ${STDINT_H_PATH}) set (MOSQ_SRCS ../lib/alias_mosq.c ../lib/alias_mosq.h @@ -37,6 +37,7 @@ set (MOSQ_SRCS ../lib/net_mosq_ocsp.c ../lib/net_mosq.c ../lib/net_mosq.h ../lib/packet_datatypes.c ../lib/packet_mosq.c ../lib/packet_mosq.h + password_mosq.c password_mosq.h persist_read_v234.c persist_read_v5.c persist_read.c persist_write_v5.c persist_write.c persist.h @@ -72,7 +73,7 @@ set (MOSQ_SRCS if (WITH_BUNDLED_DEPS) - include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/src/deps) + include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/deps) endif (WITH_BUNDLED_DEPS) option(INC_BRIDGE_SUPPORT @@ -204,9 +205,3 @@ endif (UNIX) install(TARGETS mosquitto RUNTIME DESTINATION "${CMAKE_INSTALL_SBINDIR}") install(FILES ../include/mosquitto_broker.h ../include/mosquitto_plugin.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - -if (WITH_TLS) - add_executable(mosquitto_passwd mosquitto_passwd.c ../lib/misc_mosq.c) - target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) - install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") -endif (WITH_TLS)