From 7ecd75b934583db2e4606c5c9f339da263101fff Mon Sep 17 00:00:00 2001 From: QuangHaiNguyen Date: Sun, 22 Feb 2026 11:42:02 +0100 Subject: [PATCH] Fix file path issues in multiple CMake files --- CMakeLists.txt | 4 ++-- src/hal/CMakeLists.txt | 16 ++++++---------- src/middlewares/CMakeLists.txt | 3 --- src/middlewares/osal/CMakeLists.txt | 4 ++-- src/service/CMakeLists.txt | 2 +- src/service/cli/CMakeLists.txt | 4 ++-- src/service/data_model/CMakeLists.txt | 4 ++-- src/service/event_bus/CMakeLists.txt | 3 ++- src/service/ipc/CMakeLists.txt | 4 ++-- src/service/rpc/CMakeLists.txt | 4 ++-- src/service/state_machine/CMakeLists.txt | 4 ++-- src/service/task_worker/CMakeLists.txt | 4 ++-- src/utilities/CMakeLists.txt | 23 +++++++++++------------ 13 files changed, 36 insertions(+), 43 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77d90ec6..0b172ca4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,8 +12,8 @@ set(BUILD_NUMBER 0) # Configure a header file with version + build number configure_file( - ${CMAKE_SOURCE_DIR}/cmake/ez_version.h.in - ${CMAKE_SOURCE_DIR}/inc/ez_version.h + cmake/ez_version.h.in + inc/ez_version.h ) #Only build test, targets, and extern when being build as a project diff --git a/src/hal/CMakeLists.txt b/src/hal/CMakeLists.txt index a40bbd03..4810d759 100644 --- a/src/hal/CMakeLists.txt +++ b/src/hal/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating ez_hal_lib library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) # Source files --------------------------------------------------------------- @@ -42,11 +42,11 @@ target_compile_definitions(ez_hal_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_hal_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/hal - ${CMAKE_SOURCE_DIR}/inc/hal/uart - ${CMAKE_SOURCE_DIR}/inc/hal/gpio - ${CMAKE_SOURCE_DIR}/inc/hal/i2c - ${CMAKE_SOURCE_DIR}/inc/hal/spi + ${FRAMEWORK_ROOT_DIR}/inc/hal + ${FRAMEWORK_ROOT_DIR}/inc/hal/uart + ${FRAMEWORK_ROOT_DIR}/inc/hal/gpio + ${FRAMEWORK_ROOT_DIR}/inc/hal/i2c + ${FRAMEWORK_ROOT_DIR}/inc/hal/spi PRIVATE # Please add private folders here INTERFACE @@ -56,12 +56,8 @@ target_include_directories(ez_hal_lib # Link libraries ------------------------------------------------------------- target_link_libraries(ez_hal_lib - PUBLIC - # Please add public libraries PRIVATE ez_utilities_lib - INTERFACE - # Please add interface libraries ) # End of file diff --git a/src/middlewares/CMakeLists.txt b/src/middlewares/CMakeLists.txt index da8dd032..e56671cd 100644 --- a/src/middlewares/CMakeLists.txt +++ b/src/middlewares/CMakeLists.txt @@ -11,9 +11,6 @@ message(STATUS "**********************************************************") message(STATUS "* Generating ez_middlewares_lib library build files") message(STATUS "**********************************************************") - -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) - # Inlcude subfolders----------------------------------------------------------- if(ENABLE_EZ_OSAL) add_subdirectory(osal) diff --git a/src/middlewares/osal/CMakeLists.txt b/src/middlewares/osal/CMakeLists.txt index b1652531..fed9bece 100644 --- a/src/middlewares/osal/CMakeLists.txt +++ b/src/middlewares/osal/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating ez_osal_lib library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) # Source files --------------------------------------------------------------- @@ -39,7 +39,7 @@ target_compile_definitions(ez_osal_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_osal_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/middlewares/osal + ${FRAMEWORK_ROOT_DIR}/inc/middlewares/osal PRIVATE # Please add private folders here INTERFACE diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index 798fff58..d6be9dc5 100755 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating ez_service_lib library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) # Inlcude subfolders----------------------------------------------------------- diff --git a/src/service/cli/CMakeLists.txt b/src/service/cli/CMakeLists.txt index 387f2026..0ca1cfba 100644 --- a/src/service/cli/CMakeLists.txt +++ b/src/service/cli/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating ez_cli_lib library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) # Source files --------------------------------------------------------------- @@ -34,7 +34,7 @@ target_compile_definitions(ez_cli_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_cli_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/service/cli + ${FRAMEWORK_ROOT_DIR}/inc/service/cli PRIVATE # Please add private folders here INTERFACE diff --git a/src/service/data_model/CMakeLists.txt b/src/service/data_model/CMakeLists.txt index 9e50a741..29f32531 100644 --- a/src/service/data_model/CMakeLists.txt +++ b/src/service/data_model/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating data_model library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/ezmsdk) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) # Source files --------------------------------------------------------------- @@ -34,7 +34,7 @@ target_compile_definitions(ez_data_model_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_data_model_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/service/data_model + ${FRAMEWORK_ROOT_DIR}/inc/service/data_model PRIVATE # Unused INTERFACE diff --git a/src/service/event_bus/CMakeLists.txt b/src/service/event_bus/CMakeLists.txt index 87094aa9..80d962e7 100644 --- a/src/service/event_bus/CMakeLists.txt +++ b/src/service/event_bus/CMakeLists.txt @@ -11,6 +11,7 @@ message(STATUS "**********************************************************") message(STATUS "* Generating ez_event_bus library build files") message(STATUS "**********************************************************") +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) # Source files --------------------------------------------------------------- target_sources(ez_event_bus_lib @@ -31,7 +32,7 @@ target_compile_definitions(ez_event_bus_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_event_bus_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/service/event_bus + ${FRAMEWORK_ROOT_DIR}/inc/service/event_bus PRIVATE # Unused INTERFACE diff --git a/src/service/ipc/CMakeLists.txt b/src/service/ipc/CMakeLists.txt index f06e1fb4..10770e9b 100644 --- a/src/service/ipc/CMakeLists.txt +++ b/src/service/ipc/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating ez_ipc_lib library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) # Source files --------------------------------------------------------------- @@ -34,7 +34,7 @@ target_compile_definitions(ez_ipc_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_ipc_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/service/ipc + ${FRAMEWORK_ROOT_DIR}/inc/service/ipc PRIVATE # Please add private folders here INTERFACE diff --git a/src/service/rpc/CMakeLists.txt b/src/service/rpc/CMakeLists.txt index a43e8e93..cb772126 100644 --- a/src/service/rpc/CMakeLists.txt +++ b/src/service/rpc/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating ez_rpc_lib library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) # Source files --------------------------------------------------------------- @@ -34,7 +34,7 @@ target_compile_definitions(ez_rpc_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_rpc_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/service/rpc + ${FRAMEWORK_ROOT_DIR}/inc/service/rpc PRIVATE # Please add private folders here INTERFACE diff --git a/src/service/state_machine/CMakeLists.txt b/src/service/state_machine/CMakeLists.txt index 31402bf5..3a393947 100644 --- a/src/service/state_machine/CMakeLists.txt +++ b/src/service/state_machine/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating ez_state_machine_lib library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) # Source files --------------------------------------------------------------- @@ -34,7 +34,7 @@ target_compile_definitions(ez_state_machine_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_state_machine_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/service/state_machine + ${FRAMEWORK_ROOT_DIR}/inc/service/state_machine PRIVATE # Please add private folders here INTERFACE diff --git a/src/service/task_worker/CMakeLists.txt b/src/service/task_worker/CMakeLists.txt index 6486e1ce..3b1e473f 100644 --- a/src/service/task_worker/CMakeLists.txt +++ b/src/service/task_worker/CMakeLists.txt @@ -12,7 +12,7 @@ message(STATUS "* Generating ez_task_worker_lib library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../..) # Source files --------------------------------------------------------------- @@ -36,7 +36,7 @@ target_compile_definitions(ez_task_worker_lib # Include directory ----------------------------------------------------------- target_include_directories(ez_task_worker_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/service/task_worker + ${FRAMEWORK_ROOT_DIR}/inc/service/task_worker PRIVATE # INTERFACE diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt index d0581834..5ee21d43 100644 --- a/src/utilities/CMakeLists.txt +++ b/src/utilities/CMakeLists.txt @@ -11,7 +11,7 @@ message(STATUS "**********************************************************") message(STATUS "* Generating ez_utilities library build files") message(STATUS "**********************************************************") -set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded) +set(FRAMEWORK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) # Source files --------------------------------------------------------------- @@ -44,20 +44,19 @@ target_compile_definitions(ez_utilities_lib EZ_BUILD_WITH_CMAKE=$ ) - # Include directory ----------------------------------------------------------- target_include_directories(ez_utilities_lib PUBLIC - ${CMAKE_SOURCE_DIR}/inc/utilities/endian - ${CMAKE_SOURCE_DIR}/inc/utilities/assert - ${CMAKE_SOURCE_DIR}/inc/utilities/hexdump - ${CMAKE_SOURCE_DIR}/inc/utilities/linked_list - ${CMAKE_SOURCE_DIR}/inc/utilities/logging - ${CMAKE_SOURCE_DIR}/inc/utilities/ring_buffer - ${CMAKE_SOURCE_DIR}/inc/utilities/static_alloc - ${CMAKE_SOURCE_DIR}/inc/utilities/system_error - ${CMAKE_SOURCE_DIR}/inc/utilities/queue - ${CMAKE_SOURCE_DIR}/inc/utilities + ${FRAMEWORK_ROOT_DIR}/inc/utilities/endian + ${FRAMEWORK_ROOT_DIR}/inc/utilities/assert + ${FRAMEWORK_ROOT_DIR}/inc/utilities/hexdump + ${FRAMEWORK_ROOT_DIR}/inc/utilities/linked_list + ${FRAMEWORK_ROOT_DIR}/inc/utilities/logging + ${FRAMEWORK_ROOT_DIR}/inc/utilities/ring_buffer + ${FRAMEWORK_ROOT_DIR}/inc/utilities/static_alloc + ${FRAMEWORK_ROOT_DIR}/inc/utilities/system_error + ${FRAMEWORK_ROOT_DIR}/inc/utilities/queue + ${FRAMEWORK_ROOT_DIR}/inc/utilities )