mirror of
https://github.com/eclipse-mosquitto/mosquitto.git
synced 2026-09-24 09:14:02 +08:00
Merge branch 'master' into develop
This commit is contained in:
@@ -16,7 +16,7 @@ set_target_properties(mosquittopp PROPERTIES
|
||||
VERSION ${VERSION}
|
||||
SOVERSION 1
|
||||
)
|
||||
install(TARGETS mosquittopp RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
|
||||
install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
|
||||
|
||||
if (${WITH_STATIC_LIBRARIES} STREQUAL ON)
|
||||
if (${WITH_PIC} STREQUAL OFF)
|
||||
@@ -39,10 +39,10 @@ if (${WITH_STATIC_LIBRARIES} STREQUAL ON)
|
||||
)
|
||||
|
||||
target_compile_definitions(mosquittopp_static PUBLIC "LIBMOSQUITTO_STATIC")
|
||||
install(TARGETS mosquittopp_static RUNTIME DESTINATION ${BINDIR} ARCHIVE DESTINATION ${LIBDIR})
|
||||
install(TARGETS mosquittopp_static RUNTIME DESTINATION "${BINDIR}" ARCHIVE DESTINATION "${LIBDIR}")
|
||||
endif (${WITH_STATIC_LIBRARIES} STREQUAL ON)
|
||||
|
||||
install(FILES mosquittopp.h DESTINATION ${INCLUDEDIR})
|
||||
install(FILES mosquittopp.h DESTINATION "${INCLUDEDIR}")
|
||||
|
||||
if (UNIX AND NOT APPLE)
|
||||
install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
|
||||
|
||||
Reference in New Issue
Block a user