Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mqtt-scm-1.rockspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ build = {
CMAKE_BUILD_TYPE="RelWithDebInfo";
TARANTOOL_INSTALL_LIBDIR="$(LIBDIR)";
TARANTOOL_INSTALL_LUADIR="$(LUADIR)";
STATIC_BUILD="$(STATIC_BUILD)";
STATIC_BUILD="ON";
};
platforms = {
macosx = {
Expand Down
3 changes: 2 additions & 1 deletion mqtt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
option(DOCUMENTATION "Build documentation?" OFF)

option(WITH_STATIC_LIBRARIES "Build static versions of the libmosquitto/pp libraries?" OFF)
option(WITH_PIC "Build the static library with PIC (Position Independent Code) enabled archives?" OFF)

if( STATIC_BUILD )
set(WITH_STATIC_LIBRARIES ON)
Expand All @@ -20,7 +21,7 @@ add_library(driver SHARED driver.c)

if( DEFINED STATIC_BUILD )
set(CMAKE_C_FLAGS "-ldl -lpthread")
add_subdirectory(../third_party/mosquitto ../third_party/mosquitto/build)
add_subdirectory(../third_party/mosquitto ../third_party/mosquitto/build EXCLUDE_FROM_ALL)
include_directories(../third_party/mosquitto/lib)
if( STATIC_BUILD )
target_link_libraries(driver libmosquitto_static ${LDFLAGS_EX})
Expand Down