From 40083a882b5fa05380bc4eff9abce2a1672b60fe Mon Sep 17 00:00:00 2001 From: Alex Lorenz Date: Mon, 22 Jul 2024 19:58:10 -0700 Subject: [PATCH] [android] fix the android build Macros can't yet be built as there's no host build support yet --- Sources/CMakeLists.txt | 4 ++-- Sources/FoundationEssentials/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index f7f7ba156..7a959f34d 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -14,8 +14,8 @@ add_subdirectory(_FoundationCShims) -# Disable the macro build on Windows until we can correctly build it for the host architecture -if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows) +# Disable the macro build on Windows and Android until we can correctly build it for the host architecture +if(NOT (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "Android")) add_subdirectory(FoundationMacros) endif() diff --git a/Sources/FoundationEssentials/CMakeLists.txt b/Sources/FoundationEssentials/CMakeLists.txt index d9ebc2ebb..1db765973 100644 --- a/Sources/FoundationEssentials/CMakeLists.txt +++ b/Sources/FoundationEssentials/CMakeLists.txt @@ -48,7 +48,7 @@ add_subdirectory(String) add_subdirectory(TimeZone) add_subdirectory(URL) -if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows) +if(NOT (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "Android")) # Depend on FoundationMacros add_dependencies(FoundationEssentials FoundationMacros) target_compile_options(FoundationEssentials PRIVATE -plugin-path ${CMAKE_BINARY_DIR}/lib)