From 80f4327e79eeabada113b2fa8364a253c719c937 Mon Sep 17 00:00:00 2001 From: Leonmmcoset Date: Tue, 21 Apr 2026 02:24:47 +0800 Subject: [PATCH] w --- CMakeLists.txt | 12 ++++++++++++ cleonos/third-party/doomgeneric | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29fffd9..c6b342f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -613,6 +613,13 @@ set(DOOMGENERIC_APP_SOURCES) foreach(_base IN LISTS DOOMGENERIC_SRC_BASENAMES) list(APPEND DOOMGENERIC_APP_SOURCES "cleonos/third-party/doomgeneric/doomgeneric/${_base}.c") endforeach() +set(DOOMGENERIC_REQUIRED_SOURCE "${CMAKE_SOURCE_DIR}/cleonos/third-party/doomgeneric/doomgeneric/dummy.c") +if(EXISTS "${DOOMGENERIC_REQUIRED_SOURCE}") + set(DOOMGENERIC_AVAILABLE ON) +else() + set(DOOMGENERIC_AVAILABLE OFF) + cl_log_warn("doomgeneric sources missing, doom app will be skipped: ${DOOMGENERIC_REQUIRED_SOURCE}") +endif() file(GLOB_RECURSE DOOMGENERIC_DEP_SOURCES_ABS CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/cleonos/third-party/doomgeneric/doomgeneric/*.h" "${CMAKE_SOURCE_DIR}/cleonos/c/apps/doom/*.h" @@ -651,6 +658,11 @@ foreach(SRC IN LISTS USER_APP_MAIN_SOURCES) continue() endif() + if(_app_name STREQUAL "doom" AND NOT DOOMGENERIC_AVAILABLE) + cl_log_warn("skip user app doom because doomgeneric sources are unavailable") + continue() + endif() + list(FIND USER_APP_NAMES "${_app_name}" _dup_name_idx) if(NOT _dup_name_idx EQUAL -1) cl_log_error("duplicate user app name: ${_app_name}") diff --git a/cleonos/third-party/doomgeneric b/cleonos/third-party/doomgeneric index 64d0633..66e0446 160000 --- a/cleonos/third-party/doomgeneric +++ b/cleonos/third-party/doomgeneric @@ -1 +1 @@ -Subproject commit 64d06339fc218c4597e966537a7eb5e59008067b +Subproject commit 66e044632a5b5ca3e2f5deff2ec52cd8787c71be