d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake build fixes.

Browse Source
This commit is contained in:
Roger A. Light 2020-10-13 15:52:01 +01:00
parent 24a9c7d508
commit 89733138bb
10 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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)

1
apps/CMakeLists.txt Normal file
View File

@ -0,0 +1 @@
add_subdirectory(mosquitto_passwd)

16
apps/mosquitto_passwd/CMakeLists.txt Normal file
View File

@ -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)

2
client/CMakeLists.txt
View File

@ -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})

3
lib/CMakeLists.txt
View File

@ -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

1
lib/cpp/CMakeLists.txt
View File

@ -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)

1
plugins/CMakeLists.txt Normal file
View File

@ -0,0 +1 @@
add_subdirectory(message-timestamp)

10
plugins/message-timestamp/CMakeLists.txt Normal file
View File

@ -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}")

0
plugins/message-timestamp/mosquitto_timestamp.c → plugins/message-timestamp/mosquitto_message_timestamp.c
View File

13
src/CMakeLists.txt
View File

@ -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)