mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 06:38:59 +08:00
55 lines
2.2 KiB
Diff
55 lines
2.2 KiB
Diff
|
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
|
||
|
|
index a9f8908..5c98f3f 100644
|
||
|
|
--- a/cmake/CMakeLists.txt
|
||
|
|
+++ b/cmake/CMakeLists.txt
|
||
|
|
@@ -17,6 +17,5 @@ install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name}
|
||
|
|
|
||
|
|
install(FILES
|
||
|
|
"${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake"
|
||
|
|
- FindPahoMqttC.cmake
|
||
|
|
"${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake"
|
||
|
|
DESTINATION lib/cmake/${package_name})
|
||
|
|
diff --git a/cmake/PahoMqttCppConfig.cmake.in b/cmake/PahoMqttCppConfig.cmake.in
|
||
|
|
index e06dc68..df1cfa6 100644
|
||
|
|
--- a/cmake/PahoMqttCppConfig.cmake.in
|
||
|
|
+++ b/cmake/PahoMqttCppConfig.cmake.in
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
include(CMakeFindDependencyMacro)
|
||
|
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
||
|
|
-find_dependency(PahoMqttC REQUIRED)
|
||
|
|
+find_dependency(eclipse-paho-mqtt-c REQUIRED)
|
||
|
|
list(REMOVE_AT CMAKE_MODULE_PATH -1)
|
||
|
|
|
||
|
|
include("${CMAKE_CURRENT_LIST_DIR}/@package_name@Targets.cmake")
|
||
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||
|
|
index bfcf6bb..089e35a 100644
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -23,7 +23,7 @@
|
||
|
|
# Frank Pagliughi - made the shared library optional
|
||
|
|
#*******************************************************************************/
|
||
|
|
|
||
|
|
-find_package(PahoMqttC REQUIRED)
|
||
|
|
+find_package(eclipse-paho-mqtt-c CONFIG REQUIRED)
|
||
|
|
|
||
|
|
# --- The headers ---
|
||
|
|
|
||
|
|
@@ -91,7 +91,7 @@ if(PAHO_BUILD_SHARED)
|
||
|
|
## add dependencies to the shared library
|
||
|
|
target_link_libraries(paho-mqttpp3
|
||
|
|
PRIVATE ${LIBS_SYSTEM}
|
||
|
|
- PUBLIC PahoMqttC::PahoMqttC)
|
||
|
|
+ PUBLIC eclipse-paho-mqtt-c::paho-mqtt3a eclipse-paho-mqtt-c::paho-mqtt3c eclipse-paho-mqtt-c::paho-mqtt3as eclipse-paho-mqtt-c::paho-mqtt3cs)
|
||
|
|
|
||
|
|
# It would be nice to exort the include paths from the obj lib, but we
|
||
|
|
# get an export error. Perhaps in a future version?
|
||
|
|
@@ -129,7 +129,7 @@ if(PAHO_BUILD_STATIC)
|
||
|
|
## add dependencies to the shared library
|
||
|
|
target_link_libraries(paho-mqttpp3-static
|
||
|
|
PRIVATE ${LIBS_SYSTEM}
|
||
|
|
- PUBLIC PahoMqttC::PahoMqttC)
|
||
|
|
+ PUBLIC eclipse-paho-mqtt-c::paho-mqtt3as-static eclipse-paho-mqtt-c::paho-mqtt3cs-static)
|
||
|
|
|
||
|
|
target_include_directories(paho-mqttpp3-static PUBLIC
|
||
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|