mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-02 13:59:59 +00:00
Code Issues Projects Releases Wiki Activity

paho-mqtt-cpp: Upgrade to 1.4.1 release

Browse Source 
License file LICENSE is added, therefore use that for checksums
license still remains same.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2024-09-04 16:59:13 -07:00
parent 394f3537c5
commit 0a37700632
2 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch
+26 -32
View File
@@ -13,47 +13,41 @@ Upstream-Status: Pending
src/samples/CMakeLists.txt | 4 ++-- src/samples/CMakeLists.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-) 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index a9f8908..7eadc60 100644
--- a/cmake/CMakeLists.txt --- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt
@@ -11,7 +11,7 @@ export(EXPORT ${package_name} @@ -34,7 +34,7 @@ export(EXPORT ${package_name}
FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake" )
NAMESPACE ${package_name}::)
-install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} install(EXPORT ${package_name}
+install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} - DESTINATION lib/cmake/${package_name}
FILE ${package_name}Targets.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}
NAMESPACE ${package_name}::) FILE ${package_name}Targets.cmake
NAMESPACE ${package_name}::
@@ -19,4 +19,4 @@ install(FILES )
"${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" @@ -42,5 +42,5 @@ install(EXPORT ${package_name}
FindPahoMqttC.cmake install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake"
- DESTINATION lib/cmake/${package_name}) "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake"
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}) - DESTINATION lib/cmake/${package_name}
diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}
index 3ca0a75..c915cd5 100644 )
--- a/src/samples/CMakeLists.txt --- a/examples/CMakeLists.txt
+++ b/src/samples/CMakeLists.txt +++ b/examples/CMakeLists.txt
@@ -71,7 +71,7 @@ endforeach() @@ -65,7 +65,7 @@ endforeach()
## install binaries ## install binaries
install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples
- RUNTIME DESTINATION bin - RUNTIME DESTINATION bin
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR}
) )
## Build the SSL/TLS samples, if selected ## Build the SSL/TLS samples, if selected
@@ -89,7 +89,7 @@ if(PAHO_WITH_SSL) @@ -80,7 +80,7 @@ if(PAHO_WITH_SSL)
endforeach() endforeach()
install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples
- RUNTIME DESTINATION bin - RUNTIME DESTINATION bin
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR}
) )
endif() endif()
--
2.34.1
meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb → meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb
+3 -3
View File
@@ -5,15 +5,15 @@ SECTION = "console/network"
LICENSE = "EPL-2.0 | EDL-1.0" LICENSE = "EPL-2.0 | EDL-1.0"
LIC_FILES_CHKSUM = " \ LIC_FILES_CHKSUM = " \
file://src/mqtt/message.h;beginline=9;endline=18;md5=c5ceecf5ab99d44dcfaaabdce289071b \ file://LICENSE;md5=c0fa3a632eea67f4079c54df781d1441 \
file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \
file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
" "
SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.3.x \ SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.4.x \
file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \
" "
SRCREV = "5e0d1bf37b4826d680ec066ec42afd133851a681" SRCREV = "c310578ee68d38cd53e79d7107fb41dc68dbafe0"
DEPENDS = "openssl paho-mqtt-c" DEPENDS = "openssl paho-mqtt-c"