-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
aws-iot-device-sdk-cpp-v2: fix build with latest CRT
Breaking change in CMAKE file of CRT libs. aws/aws-iot-device-sdk-cpp-v2#776 (cherry picked from commit 22d2bed)
- Loading branch information
1 parent
45e846d
commit 1edad5a
Showing
2 changed files
with
22 additions
and
1 deletion.
There are no files selected for viewing
18 changes: 18 additions & 0 deletions
18
...s-sdk/aws-iot-device-sdk-cpp-v2/aws-iot-device-sdk-cpp-v2/001-cmake-aws-module-path.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters