From 3297328f8d8902c80a154d96517870d2dbae7b4a Mon Sep 17 00:00:00 2001
From: yafen <yafen@iscas.ac.cn>
Date: Wed, 11 Aug 2021 04:58:33 +0800
Subject: [PATCH 1/2] Revert "Revert "Add MMAL and MMAL_APPS to 64bit builds""

This reverts commit f97b1af1b3e653f9da2c1a3643479bfd469e3b74.
---
 CMakeLists.txt                         | 18 ++++++++----------
 host_applications/linux/CMakeLists.txt |  4 ++--
 interface/mmal/CMakeLists.txt          |  6 ++++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe67fc8..d8ba238 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,13 +8,9 @@ SET(PROJECT_VER_PATCH 0)
 SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
 SET(PROJECT_APIVER "${PROJECT_VER}")
 
-if(ARM64)
-   set(BUILD_MMAL FALSE)
-   set(BUILD_MMAL_APPS FALSE)
-else()
-   set(BUILD_MMAL TRUE)
-   set(BUILD_MMAL_APPS TRUE)
-endif()
+set(BUILD_MMAL TRUE)
+set(BUILD_MMAL_APPS TRUE)
+
 set(vmcs_root ${PROJECT_SOURCE_DIR})
 get_filename_component(VIDEOCORE_ROOT . ABSOLUTE)
 
@@ -78,9 +74,11 @@ if(BUILD_MMAL)
 endif()
 
 # VidTex supports Android and Linux
-if(BUILD_MMAL_APPS)
-add_subdirectory(host_applications/android/apps/vidtex)
-endif(BUILD_MMAL_APPS)
+if(NOT ARM64)
+   if(BUILD_MMAL_APPS)
+   add_subdirectory(host_applications/android/apps/vidtex)
+   endif(BUILD_MMAL_APPS)
+endif()
 
 if(NOT ARM64)
    add_subdirectory(middleware/openmaxil)
diff --git a/host_applications/linux/CMakeLists.txt b/host_applications/linux/CMakeLists.txt
index 928b637..4bb1e98 100644
--- a/host_applications/linux/CMakeLists.txt
+++ b/host_applications/linux/CMakeLists.txt
@@ -4,9 +4,9 @@ add_subdirectory(libs/bcm_host)
 add_subdirectory(apps/gencmd)
 add_subdirectory(apps/tvservice)
 add_subdirectory(apps/vcmailbox)
+add_subdirectory(apps/raspicam)
+add_subdirectory(libs/sm)
 if(NOT ARM64)
-   add_subdirectory(apps/raspicam)
-   add_subdirectory(libs/sm)
    add_subdirectory(apps/smem)
 endif()
 add_subdirectory(libs/debug_sym)
diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt
index 46f149d..8208f7c 100644
--- a/interface/mmal/CMakeLists.txt
+++ b/interface/mmal/CMakeLists.txt
@@ -11,8 +11,10 @@ add_subdirectory(core)
 add_subdirectory(util)
 add_subdirectory(vc)
 add_subdirectory(components)
-add_subdirectory(openmaxil)
-add_subdirectory(client)
+if(NOT ARM64)
+   add_subdirectory(openmaxil)
+   add_subdirectory(client)
+endif()
 
 target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)
 
-- 
2.27.0

