natas_hw
/
paho
mirror of https://github.com/eclipse/paho.mqtt.c
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix names of static libraries 

Signed-off-by: Roman Ondráček <ondracek.roman@centrum.cz>
This commit is contained in:
Roman Ondráček 2019-08-12 21:20:09 +02:00
parent 7a31c2d9e2
commit 8cc51c78b7
No known key found for this signature in database
GPG Key ID: 8ADBFC75D6E4D4CC
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conanfile.py
View File

@ -62,14 +62,14 @@ conan_basic_setup()''')
else:
if self.options.asynchronous:
if self.options.SSL:
self.cpp_info.libs.append("paho-mqtt3as-static")
self.cpp_info.libs.append("paho-mqtt3as")
else:
self.cpp_info.libs.append("paho-mqtt3a-static")
self.cpp_info.libs.append("paho-mqtt3a")
else:
if self.options.SSL:
self.cpp_info.libs.append("paho-mqtt3cs-static")
self.cpp_info.libs.append("paho-mqtt3cs")
else:
self.cpp_info.libs.append("paho-mqtt3c-static")
self.cpp_info.libs.append("paho-mqtt3c")
if self.settings.os == "Windows":
if not self.options.shared:

22
src/CMakeLists.txt
View File

@ -92,13 +92,13 @@ INSTALL(TARGETS MQTTVersion
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
IF (PAHO_BUILD_STATIC)
ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj> MQTTClient.c)
ADD_LIBRARY(paho-mqtt3a-static STATIC $<TARGET_OBJECTS:common_obj> MQTTAsync.c)
ADD_LIBRARY(paho-mqtt3c STATIC $<TARGET_OBJECTS:common_obj> MQTTClient.c)
ADD_LIBRARY(paho-mqtt3a STATIC $<TARGET_OBJECTS:common_obj> MQTTAsync.c)
TARGET_LINK_LIBRARIES(paho-mqtt3c-static ${LIBS_SYSTEM})
TARGET_LINK_LIBRARIES(paho-mqtt3a-static ${LIBS_SYSTEM})
TARGET_LINK_LIBRARIES(paho-mqtt3c ${LIBS_SYSTEM})
TARGET_LINK_LIBRARIES(paho-mqtt3a ${LIBS_SYSTEM})
INSTALL(TARGETS paho-mqtt3c-static paho-mqtt3a-static
INSTALL(TARGETS paho-mqtt3c paho-mqtt3a
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF()
@ -162,18 +162,18 @@ IF (PAHO_WITH_SSL)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
IF (PAHO_BUILD_STATIC)
ADD_LIBRARY(paho-mqtt3cs-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c)
ADD_LIBRARY(paho-mqtt3as-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c)
ADD_LIBRARY(paho-mqtt3cs STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c)
ADD_LIBRARY(paho-mqtt3as STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c)
TARGET_LINK_LIBRARIES(paho-mqtt3cs-static ${OPENSSL_LIBRARIES} ${LIBS_SYSTEM})
TARGET_LINK_LIBRARIES(paho-mqtt3as-static ${OPENSSL_LIBRARIES} ${LIBS_SYSTEM})
TARGET_LINK_LIBRARIES(paho-mqtt3cs ${OPENSSL_LIBRARIES} ${LIBS_SYSTEM})
TARGET_LINK_LIBRARIES(paho-mqtt3as ${OPENSSL_LIBRARIES} ${LIBS_SYSTEM})
SET_TARGET_PROPERTIES(
paho-mqtt3cs-static paho-mqtt3as-static PROPERTIES
paho-mqtt3cs paho-mqtt3as PROPERTIES
VERSION ${CLIENT_VERSION}
SOVERSION ${PAHO_VERSION_MAJOR}
COMPILE_DEFINITIONS "OPENSSL=1")
INSTALL(TARGETS paho-mqtt3cs-static paho-mqtt3as-static
INSTALL(TARGETS paho-mqtt3cs paho-mqtt3as
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
ENDIF()
ENDIF()