From 82f10380c9072638c00b5156038e0af6b28d2d5a Mon Sep 17 00:00:00 2001 From: Sebastian Kügler Date: Sat, 7 Nov 2015 01:51:31 +0100 Subject: Recognize Android as CMAKE_SYSTEM_NAME MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the build for me against Qt 5.5. It seems Android is not Linux anymore, but uses its own CMAKE_SYSTEM_NAME now, so in this case we also want to compile android.cpp. This change should be rather safe, since it catches a condition that was not previously handled. Signed-off-by: Sebastian Kügler Signed-off-by: Dirk Hohndel --- subsurface-core/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/subsurface-core/CMakeLists.txt b/subsurface-core/CMakeLists.txt index bd4950767..b05dbe003 100644 --- a/subsurface-core/CMakeLists.txt +++ b/subsurface-core/CMakeLists.txt @@ -6,6 +6,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") else() set(PLATFORM_SRC linux.c) endif() +elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") + set(PLATFORM_SRC android.cpp) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(PLATFORM_SRC macos.c) elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") -- cgit v1.2.3-70-g09d2