File tree Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -118,12 +118,20 @@ else()
118118 set (ANDROID_COMPILE_SDK android-28)
119119endif ()
120120
121- if (ANDROID_SDK_ROOT AND ANDROID_NDK_ROOT )
122- set (sdk_host "" ) # external SDK and NDK
123- elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
121+ if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
122+ message (FATAL_ERROR "System processor must be x86_64" )
123+ elseif (APPLE )
124124 set (sdk_host "darwin" )
125- elseif (UNIX AND NOT APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )
125+ elseif (UNIX )
126126 set (sdk_host "linux" )
127+ elseif (WIN32 )
128+ set (sdk_host "windows" ) # Untested
129+ else ()
130+ message (FATAL_ERROR "Unsupported sdk_host" )
131+ endif ()
132+
133+ if (sdk_host AND NOT sdk_host STREQUAL "windows" )
134+ # Not relying on ANDROID_SDK_ROOT / ANDROID_NDK_ROOT
127135elseif (NOT ANDROID_SDK_ROOT)
128136 message (FATAL_ERROR "ANDROID_SDK_ROOT must be set to an external SDK" )
129137elseif (NOT ANDROID_NDK_ROOT)
You can’t perform that action at this time.
0 commit comments