Andoid build fixed

a70f354c · Andrey Kamaev · 510ca536 · a70f354c
Commit a70f354c authored Jul 14, 2011 by Andrey Kamaev
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

android.toolchain.cmake android/android.toolchain.cmake +6 -7

No files found.
--- 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 )