Fix mosquitto_pub -l if compiled using cmake.
Since dde005ef92
mosquito_pub is throwing error
that 'threading support has not been compiled' when compiled using cmake.
It looks like WITH_THREADING flag is not set at top level Makefile and used
only in lib/ directory, so library is correctly compiled with threading.
But for client this flag is undefined, so it gives error on '-l' option.
This commit moves part related to WITH_THREADING flag out of lib/CMakeLists.txt
to top levele CMakeLists.txt, so it could be accessible to all subdirectories.
Signed-off-by: Marek Wodzinski <majek@w7i.pl>
This commit is contained in:
parent
0a9ee5b4cf
commit
7f1419e4de
@ -73,6 +73,30 @@ endif (${WITH_SOCKS} STREQUAL ON)
|
|||||||
|
|
||||||
option(WITH_SRV "Include SRV lookup support?" OFF)
|
option(WITH_SRV "Include SRV lookup support?" OFF)
|
||||||
|
|
||||||
|
option(WITH_THREADING "Include client library threading support?" ON)
|
||||||
|
if (${WITH_THREADING} STREQUAL ON)
|
||||||
|
add_definitions("-DWITH_THREADING")
|
||||||
|
if (WIN32)
|
||||||
|
if (CMAKE_CL_64)
|
||||||
|
set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
|
||||||
|
else (CMAKE_CL_64)
|
||||||
|
set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
|
||||||
|
endif (CMAKE_CL_64)
|
||||||
|
set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
|
||||||
|
else (WIN32)
|
||||||
|
find_library(LIBPTHREAD pthread)
|
||||||
|
if (LIBPTHREAD)
|
||||||
|
set (PTHREAD_LIBRARIES pthread)
|
||||||
|
else (LIBPTHREAD)
|
||||||
|
set (PTHREAD_LIBRARIES "")
|
||||||
|
endif()
|
||||||
|
set (PTHREAD_INCLUDE_DIR "")
|
||||||
|
endif (WIN32)
|
||||||
|
else (${WITH_THREADING} STREQUAL ON)
|
||||||
|
set (PTHREAD_LIBRARIES "")
|
||||||
|
set (PTHREAD_INCLUDE_DIR "")
|
||||||
|
endif (${WITH_THREADING} STREQUAL ON)
|
||||||
|
|
||||||
option(DOCUMENTATION "Build documentation?" ON)
|
option(DOCUMENTATION "Build documentation?" ON)
|
||||||
|
|
||||||
# ========================================
|
# ========================================
|
||||||
|
@ -5,6 +5,9 @@ Library:
|
|||||||
- Fix memory leak that occurred if mosquitto_reconnect() was used when TLS
|
- Fix memory leak that occurred if mosquitto_reconnect() was used when TLS
|
||||||
errors were present. Closes #592.
|
errors were present. Closes #592.
|
||||||
|
|
||||||
|
Build:
|
||||||
|
- Fix clients not being compiled with threading support when using CMake.
|
||||||
|
Closes #983.
|
||||||
|
|
||||||
1.5.3 - 20180925
|
1.5.3 - 20180925
|
||||||
================
|
================
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib
|
include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib
|
||||||
${STDBOOL_H_PATH} ${STDINT_H_PATH})
|
${STDBOOL_H_PATH} ${STDINT_H_PATH} ${PTHREAD_INCLUDE_DIR})
|
||||||
link_directories(${mosquitto_BINARY_DIR}/lib)
|
link_directories(${mosquitto_BINARY_DIR}/lib)
|
||||||
|
|
||||||
set(shared_src client_shared.c client_shared.h)
|
set(shared_src client_shared.c client_shared.h)
|
||||||
|
@ -2,30 +2,6 @@ option(WITH_STATIC_LIBRARIES "Build static versions of the libmosquitto/pp libra
|
|||||||
option(WITH_PIC "Build the static library with PIC (Position Independent Code) enabled archives?" OFF)
|
option(WITH_PIC "Build the static library with PIC (Position Independent Code) enabled archives?" OFF)
|
||||||
add_subdirectory(cpp)
|
add_subdirectory(cpp)
|
||||||
|
|
||||||
option(WITH_THREADING "Include client library threading support?" ON)
|
|
||||||
if (${WITH_THREADING} STREQUAL ON)
|
|
||||||
add_definitions("-DWITH_THREADING")
|
|
||||||
if (WIN32)
|
|
||||||
if (CMAKE_CL_64)
|
|
||||||
set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x64\\pthreadVC2.lib)
|
|
||||||
else (CMAKE_CL_64)
|
|
||||||
set (PTHREAD_LIBRARIES C:\\pthreads\\Pre-built.2\\lib\\x86\\pthreadVC2.lib)
|
|
||||||
endif (CMAKE_CL_64)
|
|
||||||
set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include)
|
|
||||||
else (WIN32)
|
|
||||||
find_library(LIBPTHREAD pthread)
|
|
||||||
if (LIBPTHREAD)
|
|
||||||
set (PTHREAD_LIBRARIES pthread)
|
|
||||||
else (LIBPTHREAD)
|
|
||||||
set (PTHREAD_LIBRARIES "")
|
|
||||||
endif()
|
|
||||||
set (PTHREAD_INCLUDE_DIR "")
|
|
||||||
endif (WIN32)
|
|
||||||
else (${WITH_THREADING} STREQUAL ON)
|
|
||||||
set (PTHREAD_LIBRARIES "")
|
|
||||||
set (PTHREAD_INCLUDE_DIR "")
|
|
||||||
endif (${WITH_THREADING} STREQUAL ON)
|
|
||||||
|
|
||||||
include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib
|
include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib
|
||||||
${STDBOOL_H_PATH} ${STDINT_H_PATH}
|
${STDBOOL_H_PATH} ${STDINT_H_PATH}
|
||||||
${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR})
|
${OPENSSL_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR})
|
||||||
|
Loading…
Reference in New Issue
Block a user