Skip to content

Commit

Permalink
aws-iot-device-sdk-cpp-v2: fix build with latest CRT
Browse files Browse the repository at this point in the history
Breaking change in CMAKE file of CRT libs.
aws/aws-iot-device-sdk-cpp-v2#776
  • Loading branch information
thomas-roos committed Feb 5, 2025
1 parent 3ad5168 commit 00ac4b6
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
Upstream-Status: Submitted [https://github.com/aws/aws-iot-device-sdk-cpp-v2/issues/776]

Index: git/CMakeLists.txt
===================================================================
--- git.orig/CMakeLists.txt
+++ git/CMakeLists.txt
@@ -37,10 +37,7 @@ if (${CMAKE_INSTALL_LIBDIR} STREQUAL "li
endif()

# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
-# Append that generated list to the module search path
-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
+find_package(aws-c-common REQUIRED)

if (NOT CMAKE_BUILD_TYPE)
if (NOT WIN32)
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ PROVIDES += "aws/aws-iot-device-sdk-cpp-v2"

require aws-iot-device-sdk-cpp-v2-version.inc

SRC_URI:append = " file://run-ptest"
SRC_URI:append = " \
file://run-ptest \
file://001-cmake-aws-module-path.patch \
"

S = "${WORKDIR}/git"

Expand Down

0 comments on commit 00ac4b6

Please sign in to comment.