From b39908bb94549d25b0372f73361cd71fb2700ac5 Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Mon, 1 Apr 2024 01:50:46 +0200 Subject: [PATCH 1/2] cmake: allow setting NANOPB_SRC_ROOT_FOLDER According to the CMake documentation the keyword INTERNAL implies FORCE, but the CMake implementation seems broken and does not enforce this in all cases. This can lead to rather strange behavior which path is used in the end. More details can be found at https://gitlab.kitware.com/cmake/cmake/-/issues/22734. Signed-off-by: Axel Heider --- settings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.cmake b/settings.cmake index 9838c020..20b6892b 100644 --- a/settings.cmake +++ b/settings.cmake @@ -17,7 +17,7 @@ list( ${project_modules} ) -set(NANOPB_SRC_ROOT_FOLDER "${project_dir}/nanopb" CACHE INTERNAL "") +set(NANOPB_SRC_ROOT_FOLDER "${project_dir}/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 013ee8d203bc091ba890786ef72c7bef840bd23c Mon Sep 17 00:00:00 2001 From: Axel Heider Date: Mon, 1 Apr 2024 01:52:47 +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 20b6892b..54af1d77 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