From 93230b06cfa2602c916efafa089dd594d760c601 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Mon, 28 Nov 2022 11:50:44 -0800 Subject: [PATCH] Fix Android continuous and presubmit builds Since cmake 3.25 LINUX is automatically set based on CMAKE_SYSTEM_NAME, which the android cmake files are setting to "Linux". This created an inconsistant state in our build system. --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a979145c0c..651bb9fdb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,6 +99,10 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) # ================================================================================================== if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT WEBGL) set(LINUX TRUE) +else() + # since cmake 3.25 LINUX is automatically set based on CMAKE_SYSTEM_NAME, which the android + # cmake files are setting to "Linux". + set(LINUX FALSE) endif() if (LINUX)