From a73425c9b58caf62e816187f2855ba001375f814 Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Wed, 4 Oct 2023 14:04:02 -0700 Subject: [PATCH 1/3] update aws-crt-cpp --- crt/aws-crt-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp index 3f165e88d..4e63460e5 160000 --- a/crt/aws-crt-cpp +++ b/crt/aws-crt-cpp @@ -1 +1 @@ -Subproject commit 3f165e88d5f3c0bb046806fdf9be7d7314a065ef +Subproject commit 4e63460e5f4c0b8c023bb4f405617c6577ab90fe From c690f527a0d8cb2b917b15737c119f6654ae6e0b Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Wed, 4 Oct 2023 14:07:11 -0700 Subject: [PATCH 2/3] update aws-crt-cpp --- crt/aws-crt-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crt/aws-crt-cpp b/crt/aws-crt-cpp index 4e63460e5..3f165e88d 160000 --- a/crt/aws-crt-cpp +++ b/crt/aws-crt-cpp @@ -1 +1 @@ -Subproject commit 4e63460e5f4c0b8c023bb4f405617c6577ab90fe +Subproject commit 3f165e88d5f3c0bb046806fdf9be7d7314a065ef From dc83f12146e858feaca5ce0bef599ca81ac300d4 Mon Sep 17 00:00:00 2001 From: Zhihui Xia Date: Thu, 5 Oct 2023 09:20:53 -0700 Subject: [PATCH 3/3] update cmake codegen --- identity/CMakeLists.txt | 4 +--- jobs/CMakeLists.txt | 4 +--- shadow/CMakeLists.txt | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/identity/CMakeLists.txt b/identity/CMakeLists.txt index f58757a02..b8997539a 100644 --- a/identity/CMakeLists.txt +++ b/identity/CMakeLists.txt @@ -59,9 +59,7 @@ else () target_compile_options(IotIdentity-cpp PRIVATE -Wall -Wno-long-long -pedantic -Werror) endif () -if (CMAKE_BUILD_TYPE STREQUAL "" OR CMAKE_BUILD_TYPE MATCHES Debug) - target_compile_definitions(IotIdentity-cpp PRIVATE "-DDEBUG_BUILD") -endif () +target_compile_definitions(IotIdentity-cpp $<$:DEBUG_BUILD>) if (BUILD_SHARED_LIBS) target_compile_definitions(IotIdentity-cpp PUBLIC "-DAWS_IOTIDENTITY_USE_IMPORT_EXPORT") diff --git a/jobs/CMakeLists.txt b/jobs/CMakeLists.txt index 4059f09fa..d0371b69f 100644 --- a/jobs/CMakeLists.txt +++ b/jobs/CMakeLists.txt @@ -59,9 +59,7 @@ else () target_compile_options(IotJobs-cpp PRIVATE -Wall -Wno-long-long -pedantic -Werror) endif () -if (CMAKE_BUILD_TYPE STREQUAL "" OR CMAKE_BUILD_TYPE MATCHES Debug) - target_compile_definitions(IotJobs-cpp PRIVATE "-DDEBUG_BUILD") -endif () +target_compile_definitions(IotJobs-cpp $<$:DEBUG_BUILD>) if (BUILD_SHARED_LIBS) target_compile_definitions(IotJobs-cpp PUBLIC "-DAWS_IOTJOBS_USE_IMPORT_EXPORT") diff --git a/shadow/CMakeLists.txt b/shadow/CMakeLists.txt index 96797b391..1a3345762 100644 --- a/shadow/CMakeLists.txt +++ b/shadow/CMakeLists.txt @@ -59,9 +59,7 @@ else () target_compile_options(IotShadow-cpp PRIVATE -Wall -Wno-long-long -pedantic -Werror) endif () -if (CMAKE_BUILD_TYPE STREQUAL "" OR CMAKE_BUILD_TYPE MATCHES Debug) - target_compile_definitions(IotShadow-cpp PRIVATE "-DDEBUG_BUILD") -endif () +target_compile_definitions(IotShadow-cpp $<$:DEBUG_BUILD>) if (BUILD_SHARED_LIBS) target_compile_definitions(IotShadow-cpp PUBLIC "-DAWS_IOTSHADOW_USE_IMPORT_EXPORT")