diff options
| author | Грешилов Вячеслав <v.greshilov@corp.mail.ru> | 2017-10-31 15:44:43 +0300 |
|---|---|---|
| committer | Yuri Gorshenin <mipt.vi002@gmail.com> | 2017-11-01 12:52:35 +0300 |
| commit | c3ffcde70fd6b701c80d6decbefe681613a97bd3 (patch) | |
| tree | 8bbc4942c702d1b415a39ca4c99b3dea04a3e443 /CMakeLists.txt | |
| parent | 3df3cec0f17a1abbffaf4ba3aae53ca51b8ca3c7 (diff) | |
Added .gitignore rules
X32 variable deleted, set USE_FILE32API by default
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f4ad0b1466..9b3f0946aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,21 +33,12 @@ function(omim_set_platform_var PLATFORM_VAR pattern) endif() endfunction() -function(omim_set_up_android ABI_VAR OS_VAR) - set(ANDROID_DETECTED TRUE PARENT_SCOPE) - if ("${ABI_VAR}" MATCHES "^(armeabi-v7a|x86)$") - set(X32 TRUE PARENT_SCOPE) - else() - set(X32 FALSE PARENT_SCOPE) - endif() -endfunction() - if (CMAKE_SYSTEM_NAME MATCHES "Linux") set(LINUX_DETECTED TRUE) endif() if (CMAKE_SYSTEM_NAME MATCHES "Android") - omim_set_up_android(${ANDROID_ABI} ${OS}) + set(ANDROID_DETECTED TRUE) endif() if (ANDROID_DETECTED AND (${OS} MATCHES "mac")) |