CMake Fixes (#584)

* Generated code format pass * Pin clang-format * Stop doing aws_use_package on projects internal to the SDK
aws · May 14, 2023 · 9685342 · 9685342
1 parent a8a131a
commit 9685342
Show file tree

Hide file tree

Showing 8 changed files with 216 additions and 221 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,8 @@ jobs:
       uses: actions/checkout@v1
 
     - name: clang-format lint
-      uses: DoozyX/clang-format-lint-action@v0.3.1
+      uses: DoozyX/clang-format-lint-action@v0.13
       with:
         # List of extensions to check
         extensions: cpp,h
+        clangFormatVersion: 11.1.0
diff --git a/devicedefender/CMakeLists.txt b/devicedefender/CMakeLists.txt
@@ -99,15 +99,11 @@ target_include_directories(IotDeviceDefender-cpp PUBLIC
 if (BUILD_DEPS)
 	if (NOT IS_SUBDIRECTORY_INCLUDE)
 		aws_use_package(aws-crt-cpp)
-        endif()
-	aws_use_package(aws-c-iot)
-endif()
-
-if (BUILD_TESTING)
-    aws_use_package(IotDeviceCommon-cpp)
+        aws_use_package(aws-c-iot)
+    endif()
 endif()
 
-target_link_libraries(IotDeviceDefender-cpp ${DEP_AWS_LIBS})
+target_link_libraries(IotDeviceDefender-cpp IotDeviceCommon-cpp)
 
 install(FILES ${AWS_IOTDEVICEDEFENDER_HEADERS} DESTINATION "include/aws/iotdevicedefender/" COMPONENT Development)
 

diff --git a/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h b/eventstream_rpc/include/aws/eventstreamrpc/EventStreamClient.h
@@ -416,7 +416,8 @@ namespace Aws
             ResultType GetResultType() const noexcept { return m_responseType; }
 
           private:
-            union AWS_EVENTSTREAMRPC_API OperationResult {
+            union AWS_EVENTSTREAMRPC_API OperationResult
+            {
                 OperationResult(Crt::ScopedResource<AbstractShapeBase> &&response) noexcept
                     : m_response(std::move(response))
                 {
@@ -445,12 +446,12 @@ namespace Aws
         {
             /* An interface shared by all operations for retrieving the response object given the model name. */
           public:
-            virtual ExpectedResponseFactory GetInitialResponseFromModelName(const Crt::String &modelName) const
-                noexcept = 0;
-            virtual ExpectedResponseFactory GetStreamingResponseFromModelName(const Crt::String &modelName) const
-                noexcept = 0;
-            virtual ErrorResponseFactory GetOperationErrorFromModelName(const Crt::String &modelName) const
-                noexcept = 0;
+            virtual ExpectedResponseFactory GetInitialResponseFromModelName(
+                const Crt::String &modelName) const noexcept = 0;
+            virtual ExpectedResponseFactory GetStreamingResponseFromModelName(
+                const Crt::String &modelName) const noexcept = 0;
+            virtual ErrorResponseFactory GetOperationErrorFromModelName(
+                const Crt::String &modelName) const noexcept = 0;
         };
 
         class AWS_EVENTSTREAMRPC_API ServiceModel

diff --git a/eventstream_rpc/tests/CMakeLists.txt b/eventstream_rpc/tests/CMakeLists.txt
@@ -28,6 +28,7 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
     endif()
 endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
+
 if (NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
 endif()
@@ -40,8 +41,6 @@ file(GLOB TESTS ${TEST_HDRS} ${TEST_SRC})
 
 set(TEST_BINARY_NAME ${PROJECT_NAME}-tests)
 
-aws_use_package(aws-crt-cpp)
-aws_use_package(EventstreamRpc-cpp)
 add_test_case(OperateWhileDisconnected)
 # The tests below can be commented out when an EchoRPC Server is running on 127.0.0.1:8033
 #add_test_case(EventStreamConnect)

diff --git a/eventstream_rpc/tests/EchoTestRpcModel.cpp b/eventstream_rpc/tests/EchoTestRpcModel.cpp
@@ -1040,8 +1040,8 @@ namespace Awstest
         return Aws::Crt::String("awstest#CauseServiceErrorResponse");
     }
 
-    Aws::Crt::Optional<Aws::Crt::String> CauseServiceErrorOperationContext::GetStreamingResponseModelName() const
-        noexcept
+    Aws::Crt::Optional<Aws::Crt::String> CauseServiceErrorOperationContext::GetStreamingResponseModelName()
+        const noexcept
     {
         return Aws::Crt::Optional<Aws::Crt::String>();
     }
@@ -1107,15 +1107,15 @@ namespace Awstest
     }
 
     Aws::Crt::ScopedResource<AbstractShapeBase> CauseStreamServiceToErrorOperationContext::
-        AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-        noexcept
+        AllocateInitialResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+            const noexcept
     {
         return EchoStreamingResponse::s_allocateFromPayload(stringView, allocator);
     }
 
     Aws::Crt::ScopedResource<AbstractShapeBase> CauseStreamServiceToErrorOperationContext::
-        AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-        noexcept
+        AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+            const noexcept
     {
         return EchoStreamingMessage::s_allocateFromPayload(stringView, allocator);
     }
@@ -1201,8 +1201,8 @@ namespace Awstest
     }
 
     Aws::Crt::ScopedResource<AbstractShapeBase> EchoStreamMessagesOperationContext::
-        AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator) const
-        noexcept
+        AllocateStreamingResponseFromPayload(Aws::Crt::StringView stringView, Aws::Crt::Allocator *allocator)
+            const noexcept
     {
         return EchoStreamingMessage::s_allocateFromPayload(stringView, allocator);
     }
@@ -1217,8 +1217,8 @@ namespace Awstest
         return Aws::Crt::String("awstest#EchoStreamingResponse");
     }
 
-    Aws::Crt::Optional<Aws::Crt::String> EchoStreamMessagesOperationContext::GetStreamingResponseModelName() const
-        noexcept
+    Aws::Crt::Optional<Aws::Crt::String> EchoStreamMessagesOperationContext::GetStreamingResponseModelName()
+        const noexcept
     {
         return Aws::Crt::String("awstest#EchoStreamingMessage");
     }