cmake: throw an error if ARM isn't detected

SerenityPorts · Nov 11, 2019 · 043e918 · 043e918
1 parent 13e1702
commit 043e918
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cmake/LibraryNaming.cmake b/cmake/LibraryNaming.cmake
@@ -67,6 +67,8 @@ elseif(XASH_ARM)
  set(BUILDARCH "${BUILDARCH}5")
  elseif(XASH_ARMv4)
  set(BUILDARCH "${BUILDARCH}4")
+ else()
+ message(SEND_ERROR "Unknown ARM")
  endif()
 
  if(XASH_ARM_HARDFP)
@@ -86,7 +88,9 @@ else()
  message(SEND_ERROR "Place your architecture name here! If this is a mistake, try to fix conditions above and report a bug")
 endif()
 
-if(BUILDOS AND BUILDARCH)
+if(BUILDOS STREQUAL "android")
+ set(POSTFIX "") # force disable for Android, as Android ports aren't distributed in normal way and doesn't follow library naming
+elif(BUILDOS AND BUILDARCH)
  set(POSTFIX "_${BUILDOS}_${BUILDARCH}")
 elseif(BUILDARCH)
  set(POSTFIX "_${BUILDARCH}")