Merge pull request #1050 from leapmotion/upd-standard

Update standard to fix Android 32-bit compatibility
leapmotion · Feb 23, 2018 · 9b81e0f · 9b81e0f
2 parents 74760e7 + 65d6723
commit 9b81e0f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/standard/standard-configVersion.cmake.in b/standard/standard-configVersion.cmake.in
@@ -18,7 +18,11 @@ if(DEFINED @ARG_NAME@_ARCHITECTURE)
       list(APPEND @ARG_NAME@_ARCHITECTURES x64)
     elseif(_arch MATCHES "i386|x86")
       list(APPEND @ARG_NAME@_ARCHITECTURES x86)
-    elseif(_arch MATCHES "arm$")
+    elseif(_arch MATCHES "armeabi-v7a")
+      list(APPEND @ARG_NAME@_ARCHITECTURES armeabi-v7a)
+    elseif(_arch MATCHES "armeabi")
+      list(APPEND @ARG_NAME@_ARCHITECTURES armeabi)
+    elseif(_arch MATCHES "^arm")
       list(APPEND @ARG_NAME@_ARCHITECTURES arm)
     elseif(_arch MATCHES "arm64|aarch64")
       list(APPEND @ARG_NAME@_ARCHITECTURES aarch64)