55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 9ab5da1..bba3cb7 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)
|
|
|
|
diff --git a/host_applications/linux/CMakeLists.txt b/host_applications/linux/CMakeLists.txt
|
|
index 9c76dbd..34515be 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 dfdee0e..d43f7bb 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)
|
|
|