From 4fb0ff48c1c2469f2eb638d2e47f8ab9309d9600 Mon Sep 17 00:00:00 2001 From: Igor Abdrakhimov Date: Wed, 17 Apr 2024 15:33:55 -0700 Subject: [PATCH 1/3] Add USE_EXTERNAL_DEPS_SOURCES cmake option (#714) --- CMakeLists.txt | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d929a52a..3f5c133aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ project(aws-iot-device-sdk-cpp-v2 include(CTest) option(BUILD_DEPS "Builds aws common runtime dependencies as part of build. Turn off if you want to control your dependency chain." ON) +option(USE_EXTERNAL_DEPS_SOURCES "Use dependencies provided by add_subdirectory command" OFF) option(BUILD_SAMPLES "(DEPRECATED) Build samples as part of the build" OFF) if (DEFINED CMAKE_PREFIX_PATH) @@ -57,6 +58,10 @@ else() endif() if (BUILD_DEPS) + if (USE_EXTERNAL_DEPS_SOURCES) + message(FATAL_ERROR "USE_EXTERNAL_DEPS_SOURCES option should be used with BUILD_DEPS set to OFF") + endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/crt/aws-crt-cpp/crt/aws-c-common/cmake") include(AwsFindPackage) @@ -70,8 +75,27 @@ if (BUILD_DEPS) endif () set(BUILD_TESTING ${BUILD_TESTING_PREV}) else() + if (USE_EXTERNAL_DEPS_SOURCES) + function(validate_deps_sources dep_name) + if (NOT ${dep_name}_SOURCE_DIR) + message(FATAL_ERROR "USE_EXTERNAL_DEPS_SOURCES option is set, but ${dep_name} project is not configured." + " ${dep_name} must be added using add_subdirectory command (or one of the higher-level commands that" + " uses add_subdirectory, like FetchContent)") + endif() + endfunction() + + validate_deps_sources(aws-crt-cpp) + validate_deps_sources(aws-c-iot) + validate_deps_sources(aws-c-common) + + list(APPEND CMAKE_MODULE_PATH "${aws-c-common_SOURCE_DIR}/cmake") + + set(IN_SOURCE_BUILD ON) + else() + set(IN_SOURCE_BUILD OFF) + endif() + include(AwsFindPackage) - set(IN_SOURCE_BUILD OFF) endif() aws_use_package(aws-crt-cpp) From 668bac4c866b87d0b481ee60888e6f6119a353a1 Mon Sep 17 00:00:00 2001 From: Igor Abdrakhimov Date: Thu, 18 Apr 2024 11:08:13 -0700 Subject: [PATCH 2/3] Update aws-c-iot version (#715) --- crt/aws-c-iot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-c-iot b/crt/aws-c-iot index e373de084..b3fe01586 160000 --- a/crt/aws-c-iot +++ b/crt/aws-c-iot @@ -1 +1 @@ -Subproject commit e373de084023a6baadae532b0664a6c0ce839749 +Subproject commit b3fe015865d7ead9fe7c9df8f8c6b38c37a51f00 From 1b92c84c7fedf995053086b7f2797bc8294e4c8b Mon Sep 17 00:00:00 2001 From: Bret Ambrose Date: Thu, 18 Apr 2024 11:25:55 -0700 Subject: [PATCH 3/3] [v1.32.6] Add USE_EXTERNAL_DEPS_SOURCES cmake option (#716) Co-authored-by: GitHub Actions --- README.md | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 42a77dd16..32de6c01f 100644 --- a/README.md +++ b/README.md @@ -131,4 +131,4 @@ is provided by code that been generated from a model of the service. This library is licensed under the [Apache 2.0 License](./documents/LICENSE). -Latest released version: v1.32.5 +Latest released version: v1.32.6 diff --git a/VERSION b/VERSION index 949ff3202..5d245052c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.32.5 +1.32.6