lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't look for source.properties to check valid SDK path

Browse Source 
* This file isn't always there apparently. Instead just look for a build-tools
  folder which must be present.
This commit is contained in:
baldurk
2019-02-04 18:40:31 +00:00
parent 5ecdb18ea7
commit 2a80fd29d0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+3 -3
View File
@@ -7,11 +7,11 @@ if(BUILD_ANDROID)
endif()
message(STATUS "Using JAVA_HOME = $ENV{JAVA_HOME}")
if(DEFINED ENV{ANDROID_HOME} AND EXISTS "$ENV{ANDROID_HOME}/platform-tools/source.properties")
if(DEFINED ENV{ANDROID_HOME} AND EXISTS "$ENV{ANDROID_HOME}/build-tools")
set(ANDROID_SDK_ROOT_PATH "$ENV{ANDROID_HOME}")
elseif(DEFINED ENV{ANDROID_SDK_ROOT} AND EXISTS "$ENV{ANDROID_SDK_ROOT}/platform-tools/source.properties")
elseif(DEFINED ENV{ANDROID_SDK_ROOT} AND EXISTS "$ENV{ANDROID_SDK_ROOT}/build-tools")
set(ANDROID_SDK_ROOT_PATH "$ENV{ANDROID_SDK_ROOT}")
elseif(DEFINED ENV{ANDROID_SDK} AND EXISTS "$ENV{ANDROID_SDK}/platform-tools/source.properties")
elseif(DEFINED ENV{ANDROID_SDK} AND EXISTS "$ENV{ANDROID_SDK}/build-tools")
set(ANDROID_SDK_ROOT_PATH "$ENV{ANDROID_SDK}")
else()
message(FATAL_ERROR "Can't locate Android SDK, set ANDROID_HOME, ANDROID_SDK_ROOT or ANDROID_SDK")