Fixed Android compilation on Windows

This commit is contained in:
Andrey Kamaev 2011-07-14 07:44:33 +00:00
parent 87cfcc8ee2
commit 0b57d904db

View File

@ -320,8 +320,8 @@ endif()
if( BUILD_WITH_ANDROID_NDK ) if( BUILD_WITH_ANDROID_NDK )
set( CMAKE_CXX_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_CXX_FLAGS}" )
set( CMAKE_C_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_C_FLAGS}" ) set( CMAKE_C_FLAGS "--sysroot=\"${ANDROID_NDK_SYSROOT}\" ${CMAKE_C_FLAGS}" )
if (ANDROID_NDK_SYSROOT MATCHES "[ ]") if (WIN32 OR ANDROID_NDK_SYSROOT MATCHES "[ ]")
# workaround for ugly cmake bug - compiler identification replaces all spaces in compiler flags with ; symbol # 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 # as result identification fails if ANDROID_NDK_SYSROOT contain spaces
include(CMakeForceCompiler) include(CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER("${CMAKE_C_COMPILER}" GNU) CMAKE_FORCE_C_COMPILER("${CMAKE_C_COMPILER}" GNU)