mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +08:00
53b9f6eb5c
* [paho-mqtt] Update to version 1.3.5 * [paho-mqtt] Fix build error * [paho-mqttpp3] Fix build error * [paho-mqttpp3] Fix build error * [paho-mqttpp3] Fix build error * [paho-mqtt] Fix old patch * [paho-mqtt] Add vcpkg_copy_tools * [paho-mqtt] Fix build error
29 lines
1013 B
Diff
29 lines
1013 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 3df385a..1ee7be0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -60,8 +60,8 @@ IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC)
|
|
MESSAGE(FATAL_ERROR "You must set either PAHO_BUILD_SHARED, PAHO_BUILD_STATIC, or both")
|
|
ENDIF()
|
|
|
|
-IF(PAHO_BUILD_DEB_PACKAGE)
|
|
- set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt)
|
|
+IF(1)
|
|
+ set(CMAKE_INSTALL_DOCDIR share/paho-mqtt)
|
|
ENDIF()
|
|
|
|
ADD_SUBDIRECTORY(src)
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 20b578a..75dc833 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -183,7 +183,7 @@ IF (PAHO_BUILD_STATIC)
|
|
ENDIF()
|
|
|
|
INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h MQTTExportDeclarations.h
|
|
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/paho-mqtt)
|
|
|
|
IF (PAHO_WITH_SSL)
|
|
SET(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes")
|