From 9045dda454406f2bcc72bd5b5657ec0574ce572a Mon Sep 17 00:00:00 2001 From: Gitea Date: Sun, 5 Nov 2023 17:01:30 +0300 Subject: [PATCH] CMake: avoid inclusion of compat/malloc on Android Android NDK has its own malloc.h. This commit fixes build on Android NDK and Termux. See the similar upstream issue https://github.com/android/ndk/issues/738 for details. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f64d76ae..dc34116d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ function(tv_add_private_includes target) "${PROJECT_SOURCE_DIR}/include/tvision/compat/windows" ) endif() - if (NOT WIN32 AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux")) + if (NOT WIN32 AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")) target_include_directories(${target} PRIVATE "${PROJECT_SOURCE_DIR}/include/tvision/compat/malloc" )