Revert "Set CMAKE_SYSROOT on CMake 3.0.0 and later, from taka-no-me#70".

These changes are unnecessary and break some intented behaviours. This reverts commit 1fd5ef6.
JDFind · Aug 27, 2017 · d1a1e10 · d1a1e10
1 parent 3a345ad
commit d1a1e10
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/android.toolchain.cmake b/android.toolchain.cmake
@@ -1173,9 +1173,7 @@ endif()
 remove_definitions( -DANDROID )
 add_definitions( -DANDROID )
 
-if( CMAKE_VERSION VERSION_GREATER "3.0.0" )
- set( CMAKE_SYSROOT ${ANDROID_SYSROOT} )
-elseif( ANDROID_SYSROOT MATCHES "[ ;\"]" )
+if( ANDROID_SYSROOT MATCHES "[ ;\"]" )
  if( CMAKE_HOST_WIN32 )
   # try to convert path to 8.3 form
   file( WRITE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/cvt83.cmd" "@echo %~s1" )