Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 6 additions & 10 deletions src/hal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand Down Expand Up @@ -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
Expand All @@ -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
)
Comment thread
QuangHaiNguyen marked this conversation as resolved.

# End of file
3 changes: 0 additions & 3 deletions src/middlewares/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/middlewares/osal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/service/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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-----------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions src/service/cli/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/service/data_model/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/service/event_bus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/service/ipc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/service/rpc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/service/state_machine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/service/task_worker/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand All @@ -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
Expand Down
23 changes: 11 additions & 12 deletions src/utilities/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------------------
Expand Down Expand Up @@ -44,20 +44,19 @@ target_compile_definitions(ez_utilities_lib
EZ_BUILD_WITH_CMAKE=$<BOOL:${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
)


Expand Down
Loading