Skip to content

O
opencv
Commit 0b57d904 authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Fixed Android compilation on Windows

parent 87cfcc8e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
android/android.toolchain.cmake
View file @ 0b57d904
...@@ -320,8 +320,8 @@ endif() ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment