From 476be686ad0692ebfaa54b91ab1b3a6027886e9c Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Sun, 31 Mar 2024 04:22:32 +0200 Subject: [PATCH 1/2] cmake: don't overwrite NANOPB_SRC_ROOT_FOLDER Signed-off-by: Axel Heider --- settings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.cmake b/settings.cmake index ae8e55a9..81397c8c 100644 --- a/settings.cmake +++ b/settings.cmake @@ -17,7 +17,7 @@ list( ${project_modules} ) -set(NANOPB_SRC_ROOT_FOLDER "${project_dir}/tools/nanopb" CACHE INTERNAL "") +set(NANOPB_SRC_ROOT_FOLDER "${project_dir}/tools/nanopb" CACHE STRING "NanoPB Folder location") set(OPENSBI_PATH "${project_dir}/tools/opensbi" CACHE STRING "OpenSBI Folder location") set(SEL4_CONFIG_DEFAULT_ADVANCED ON) From 2ad47bd718c2203d49f326121ae76d4c18405381 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Sun, 31 Mar 2024 04:19:00 +0200 Subject: [PATCH 2/2] cmake: remove trailing slash Signed-off-by: Axel Heider --- settings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.cmake b/settings.cmake index 81397c8c..1b096ebe 100644 --- a/settings.cmake +++ b/settings.cmake @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.7.2) -set(project_dir "${CMAKE_CURRENT_LIST_DIR}/../../") +set(project_dir "${CMAKE_CURRENT_LIST_DIR}/../..") file(GLOB project_modules ${project_dir}/projects/*) list( APPEND