diff --git a/android/android.toolchain.cmake b/android/android.toolchain.cmake index 4539216435..8b8b0aaa95 100644 --- a/android/android.toolchain.cmake +++ b/android/android.toolchain.cmake @@ -320,13 +320,12 @@ endif() if( BUILD_WITH_ANDROID_NDK ) set( CMAKE_CXX_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_CXX_FLAGS}" ) set( CMAKE_C_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_C_FLAGS}" ) - if (WIN32 OR ANDROID_NDK_SYSROOT MATCHES "[ ]") - # workaround for ugly cmake bug - compiler identification replaces all spaces (and somethimes " !!!) in compiler flags with ; symbol - # as result identification fails if ANDROID_NDK_SYSROOT contain spaces - include(CMakeForceCompiler) - CMAKE_FORCE_C_COMPILER("${CMAKE_C_COMPILER}" GNU) - CMAKE_FORCE_CXX_COMPILER("${CMAKE_CXX_COMPILER}" GNU) - endif() + + # workaround for ugly cmake bug - compiler identification replaces all spaces (and somethimes " !!!) in compiler flags with ; symbol + # as result identification fails if ANDROID_NDK_SYSROOT contain spaces + include(CMakeForceCompiler) + CMAKE_FORCE_C_COMPILER("${CMAKE_C_COMPILER}" GNU) + CMAKE_FORCE_CXX_COMPILER("${CMAKE_CXX_COMPILER}" GNU) endif() if( ARMEABI_V7A )