Merge branch 'runtime_select_event_loop' of github.com:awslabs/aws-c-…

…io into grand_dispatch_queue
awslabs · Nov 9, 2024 · 8bd9808 · 8bd9808
2 parents 70008b1 + f7fb5a2
commit 8bd9808
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -159,6 +159,7 @@ jobs:
   macos:
     runs-on: macos-14 # latest
     strategy:
+      fail-fast: false
       matrix:
         eventloop: ["-DAWS_USE_APPLE_NETWORK_FRAMEWORK=ON", "-DAWS_USE_APPLE_NETWORK_FRAMEWORK=OFF"]
     steps:
@@ -180,6 +181,7 @@ jobs:
   macos-debug:
     runs-on: macos-14 # latest
     strategy:
+      fail-fast: false
       matrix:
         eventloop: ["-DAWS_USE_APPLE_NETWORK_FRAMEWORK=ON", "-DAWS_USE_APPLE_NETWORK_FRAMEWORK=OFF"]
     steps:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -217,6 +217,10 @@ if (USE_VSOCK)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC "-DUSE_VSOCK")
 endif()
 
+if (AWS_USE_APPLE_NETWORK_FRAMEWORK)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE "-DAWS_USE_APPLE_NETWORK_FRAMEWORK")
+endif()
+
 target_include_directories(${PROJECT_NAME} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>)