CMakeLists: don't assume !ARM64 is ARM

CMakeLists.txt currently assume everything not ARM64 to be ARM. When
compiling on x86_64-linux, this pulls in some binaries that are arm32
only.

Some tools make some sense to have accessible even on non-ARM
workstations.  For example, `dtmerge` can be used to merge .dtb files
with overlays on a x86_64 machine (while mounting an sdcard for
example).

Simply by adding this conditionals, we're able to get a `dtmerge` binary
that runs on x86_64-linux.

Signed-off-by: Florian Klink <flokli@flokli.de>

Author: flokli

CMakeLists.txt

@@ -11,7 +11,7 @@ SET(PROJECT_APIVER "${PROJECT_VER}")
 if(ARM64)
    set(BUILD_MMAL FALSE)
    set(BUILD_MMAL_APPS FALSE)
-else()
+elseif(ARM AND NOT ARM64)
    set(BUILD_MMAL TRUE)
    set(BUILD_MMAL_APPS TRUE)
 endif()
@@ -66,7 +66,7 @@ endif()
 add_subdirectory(interface/vcos)
 add_subdirectory(interface/vmcs_host)
 add_subdirectory(interface/vchiq_arm)
-if(NOT ARM64)
+if(ARM AND NOT ARM64)
    add_subdirectory(interface/khronos)
 endif()
 
@@ -82,7 +82,7 @@ if(BUILD_MMAL_APPS)
 add_subdirectory(host_applications/android/apps/vidtex)
 endif(BUILD_MMAL_APPS)
 
-if(NOT ARM64)
+if(ARM AND NOT ARM64)
    add_subdirectory(middleware/openmaxil)
 endif()
 

host_applications/linux/CMakeLists.txt

@@ -4,7 +4,7 @@ add_subdirectory(libs/bcm_host)
 add_subdirectory(apps/gencmd)
 add_subdirectory(apps/tvservice)
 add_subdirectory(apps/vcmailbox)
-if(NOT ARM64)
+if(ARM AND NOT ARM64)
    add_subdirectory(apps/raspicam)
    add_subdirectory(libs/sm)
    add_subdirectory(apps/smem)

host_applications/linux/apps/raspicam/CMakeLists.txt

@@ -40,7 +40,7 @@ set (COMMON_SOURCES
    RaspiGPS.c
    libgps_loader.c)
 
-if(NOT ARM64)
+if(ARM AND NOT ARM64)
   set (EGL_LIBS brcmGLESv2 brcmEGL)
   set (EGL_SOURCES RaspiTex.c RaspiTexUtil.c tga.c)
   set (GL_SCENE_SOURCES

interface/vmcs_host/CMakeLists.txt

@@ -17,7 +17,7 @@ add_library(vchostif
 #add_library(bufman            vc_vchi_bufman.c            )
 set(INSTALL_TARGETS vchostif)
 
-if(NOT ARM64)
+if(ARM AND NOT ARM64)
 	# OpenMAX/IL component service
 	add_library(vcilcs
 		    vcilcs.c vcilcs_in.c vcilcs_out.c vcilcs_common.c)