From b913a091dd77ee98633ee8d12d449498bd6b5840 Mon Sep 17 00:00:00 2001 From: Neucrack Date: Thu, 21 Aug 2025 14:49:20 +0800 Subject: [PATCH] add ADD_LINK_DEFINITIONS support for cmakelist file --- components/basic/src/maix_app.cpp | 6 +++--- tools/cmake/compile.cmake | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/components/basic/src/maix_app.cpp b/components/basic/src/maix_app.cpp index 76046fbd..ea726d80 100644 --- a/components/basic/src/maix_app.cpp +++ b/components/basic/src/maix_app.cpp @@ -174,10 +174,10 @@ namespace maix::app continue; } ret = ini.GetStringValue(app_id, "icon", &app_icon); - if (ret != RET_OK) + if (ret != RET_OK || app_icon.empty()) { - printf("get app %s icon failed: %d\n", app_id.c_str(), ret); - continue; + printf("get app %s icon failed: %d, use default icon\n", app_id.c_str(), ret); + app_icon = "/maixapp/share/icon/icon.json"; } if (fs::isabs(app_icon) == false) { diff --git a/tools/cmake/compile.cmake b/tools/cmake/compile.cmake index 0a3175b8..c7a50436 100644 --- a/tools/cmake/compile.cmake +++ b/tools/cmake/compile.cmake @@ -137,11 +137,23 @@ function(register_component) endif() endforeach() + # Add definitions public + foreach(difinition ${ADD_LINK_DEFINITIONS}) + if(${include_type} STREQUAL INTERFACE) + target_link_options(${component_name} INTERFACE ${difinition}) + else() + target_link_options(${component_name} PUBLIC ${difinition}) + endif() + endforeach() + # Add definitions private foreach(difinition ${ADD_DEFINITIONS_PRIVATE}) target_compile_options(${component_name} PRIVATE ${difinition}) target_link_options(${component_name} PRIVATE ${difinition}) endforeach() + foreach(difinition ${ADD_LINK_DEFINITIONS_PRIVATE}) + target_link_options(${component_name} PRIVATE ${difinition}) + endforeach() # Add lib search path if(ADD_LINK_SEARCH_PATH)