From 2bf204a2e9f17130a7b108b186c6757fe37613d5 Mon Sep 17 00:00:00 2001 From: Cyril Fougeray Date: Fri, 18 Oct 2024 15:27:29 +0200 Subject: [PATCH] build: cmake fix order of inclusion --- zephyr/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 1d081ec..6336e5d 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -20,15 +20,15 @@ if (CONFIG_ORB_MCU_MESSAGING_LIB) set(SRC_FILES) # look for sec_priv.proto in private first, then in private_stub - set(PRIV_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../messages/private) - if (NOT EXISTS ${PRIV_INCLUDE_DIR}/sec_priv.proto) +# set(PRIV_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../messages/private) +# if (NOT EXISTS ${PRIV_INCLUDE_DIR}/sec_priv.proto) set(PRIV_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../messages/private_stub) if (NOT EXISTS ${PRIV_INCLUDE_DIR}/sec_priv.proto) message(FATAL_ERROR "sec_priv.proto not found in private or private_stub") endif () - endif () +# endif () # sec_priv.proto must be first in the list - list(APPEND PROTO_FILES ../messages/orb.proto ../messages/main.proto ../messages/sec.proto ../messages/common.proto ${PRIV_INCLUDE_DIR}/sec_priv.proto) + list(APPEND PROTO_FILES ${PRIV_INCLUDE_DIR}/sec_priv.proto ../messages/orb.proto ../messages/main.proto ../messages/sec.proto ../messages/common.proto) list(APPEND SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/main.pb.c ${CMAKE_CURRENT_BINARY_DIR}/sec.pb.c ${CMAKE_CURRENT_BINARY_DIR}/common.pb.c ${CMAKE_CURRENT_BINARY_DIR}/sec_priv.pb.c) list(APPEND NANOPB_OPTIONS "-I${PRIV_INCLUDE_DIR}")