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

Fixed CMakeLists.txt

Browse Source 
* Addded missing files plugin_subscribe and plugin_unsubscribe to src/CMakeLists.txt
* Aligned mixed usage of all-keyword and all-plain in target_link_libra…ry definition in in CMakeLists.txt

Signed-off-by: Norbert Heusser <norbert.heusser@cedalo.com>
pull/2505/head
Norbert Heusser 4 years ago
parent b922c13509
commit d4216c8cb6
19 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File

9
apps/mosquitto_ctrl/CMakeLists.txt
Unescape Escape View File

@ -41,14 +41,14 @@ if(WITH_TLS AND CJSON_FOUND)
endif()
if(WITH_STATIC_LIBRARIES)
target_link_libraries(mosquitto_ctrl libmosquitto_static)
target_link_libraries(mosquitto_ctrl PRIVATE libmosquitto_static)
else()
target_link_libraries(mosquitto_ctrl libmosquitto)
target_link_libraries(mosquitto_ctrl PRIVATE libmosquitto)
endif()
if(UNIX)
if(APPLE)
target_link_libraries(mosquitto_ctrl dl)
target_link_libraries(mosquitto_ctrl PRIVATE dl)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
#
elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
@ -56,11 +56,12 @@ if(WITH_TLS AND CJSON_FOUND)
elseif(QNX)
#
else()
target_link_libraries(mosquitto_ctrl dl)
target_link_libraries(mosquitto_ctrl PRIVATE dl)
endif()
endif()
target_link_libraries(mosquitto_ctrl
PRIVATE
${OPENSSL_LIBRARIES}
${CJSON_LIBRARIES}
)

1
apps/mosquitto_passwd/CMakeLists.txt
Unescape Escape View File

@ -21,6 +21,7 @@ if(WITH_TLS)
)
target_link_libraries(mosquitto_passwd
PRIVATE
${OPENSSL_LIBRARIES}
)

4
plugins/dynamic-security/CMakeLists.txt
Unescape Escape View File

@ -57,9 +57,9 @@ if(CJSON_FOUND AND WITH_TLS)
POSITION_INDEPENDENT_CODE 1
)
target_link_libraries(mosquitto_dynamic_security ${CJSON_LIBRARIES} ${OPENSSL_LIBRARIES})
target_link_libraries(mosquitto_dynamic_security PRIVATE ${CJSON_LIBRARIES} ${OPENSSL_LIBRARIES})
if(WIN32)
target_link_libraries(mosquitto_dynamic_security mosquitto)
target_link_libraries(mosquitto_dynamic_security PRIVATE mosquitto)
install(TARGETS mosquitto_dynamic_security
DESTINATION "${CMAKE_INSTALL_BINDIR}")
else()

2
plugins/examples/add-properties/CMakeLists.txt
Unescape Escape View File

@ -17,7 +17,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/auth-by-ip/CMakeLists.txt
Unescape Escape View File

@ -17,7 +17,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/client-lifetime-stats/CMakeLists.txt
Unescape Escape View File

@ -20,7 +20,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE 1
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/client-properties/CMakeLists.txt
Unescape Escape View File

@ -19,7 +19,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/connection-state/CMakeLists.txt
Unescape Escape View File

@ -17,7 +17,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/delayed-auth/CMakeLists.txt
Unescape Escape View File

@ -23,7 +23,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/force-retain/CMakeLists.txt
Unescape Escape View File

@ -19,7 +19,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE 1
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/message-timestamp/CMakeLists.txt
Unescape Escape View File

@ -18,7 +18,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/payload-modification/CMakeLists.txt
Unescape Escape View File

@ -19,7 +19,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE 1
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/payload-size-stats/CMakeLists.txt
Unescape Escape View File

@ -19,7 +19,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE 1
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/plugin-event-stats/CMakeLists.txt
Unescape Escape View File

@ -19,7 +19,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE 1
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/print-ip-on-publish/CMakeLists.txt
Unescape Escape View File

@ -19,7 +19,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE 1
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/topic-modification/CMakeLists.txt
Unescape Escape View File

@ -19,7 +19,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE 1
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

2
plugins/examples/wildcard-temp/CMakeLists.txt
Unescape Escape View File

@ -24,7 +24,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES
)
if(WIN32)
target_link_libraries(${PLUGIN_NAME} mosquitto)
target_link_libraries(${PLUGIN_NAME} PRIVATE mosquitto)
endif()
# Don't install, these are example plugins only.

4
plugins/persist-sqlite/CMakeLists.txt
Unescape Escape View File

@ -34,9 +34,9 @@ if(SQLITE3_FOUND AND CJSON_FOUND)
POSITION_INDEPENDENT_CODE 1
)
target_link_libraries(mosquitto_persist_sqlite ${SQLITE3_LIBRARIES})
target_link_libraries(mosquitto_persist_sqlite PRIVATE ${SQLITE3_LIBRARIES})
if(WIN32)
target_link_libraries(mosquitto_persist_sqlite mosquitto)
target_link_libraries(mosquitto_persist_sqlite PRIVATE mosquitto)
endif()
install(TARGETS mosquitto_persist_sqlite

3
src/CMakeLists.txt
Unescape Escape View File

@ -47,7 +47,9 @@ set (MOSQ_SRCS
plugin_init.c plugin_cleanup.c plugin_persist.c
plugin_acl_check.c plugin_basic_auth.c plugin_connect.c plugin_disconnect.c
plugin_extended_auth.c plugin_message.c plugin_psk_key.c plugin_public.c
plugin_subscribe.c
plugin_tick.c
plugin_unsubscribe.c
property_broker.c
../lib/property_mosq.c ../lib/property_mosq.h
read_handle.c
@ -237,6 +239,7 @@ if(WITH_BUNDLED_DEPS)
endif()
target_link_libraries(mosquitto
PRIVATE
${MOSQ_LIBS}
)

Write Preview
Loading…
Cancel
Save