generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation problems with XCode 7.1.1 and cmake 3.3.2

Browse Source
This commit is contained in:
Maksim Shabunin
2015-11-16 18:07:24 +03:00
parent 01b5971c94
commit eebd4cad66
16 changed files with 82 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platforms/android/android.toolchain.cmake
View File

@@ -1613,13 +1613,13 @@ endmacro()
macro( ANDROID_GET_ABI_RAWNAME TOOLCHAIN_FLAG VAR )
if( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI" )
if( "x${TOOLCHAIN_FLAG}" STREQUAL "xARMEABI" )
set( ${VAR} "armeabi" )
elseif( "${TOOLCHAIN_FLAG}" STREQUAL "ARMEABI_V7A" )
elseif( "x${TOOLCHAIN_FLAG}" STREQUAL "xARMEABI_V7A" )
set( ${VAR} "armeabi-v7a" )
elseif( "${TOOLCHAIN_FLAG}" STREQUAL "X86" )
elseif( "x${TOOLCHAIN_FLAG}" STREQUAL "xX86" )
set( ${VAR} "x86" )
elseif( "${TOOLCHAIN_FLAG}" STREQUAL "MIPS" )
elseif( "x${TOOLCHAIN_FLAG}" STREQUAL "xMIPS" )
set( ${VAR} "mips" )
else()
set( ${VAR} "unknown" )
@@ -1652,7 +1652,7 @@ if( NOT PROJECT_NAME STREQUAL "CMAKE_TRY_COMPILE" )
ANDROID_APP_PIE
)
if( DEFINED ${__var} )
if( "${__var}" MATCHES " ")
if( "${${__var}}" MATCHES " ")
set( __toolchain_config "${__toolchain_config}set( ${__var} \"${${__var}}\" CACHE INTERNAL \"\" )\n" )
else()
set( __toolchain_config "${__toolchain_config}set( ${__var} ${${__var}} CACHE INTERNAL \"\" )\n" )