Skip to content

Commit

Permalink
Merge pull request #5 from QuangHaiNguyen/change_folder_name
Browse files Browse the repository at this point in the history
Change folder name
  • Loading branch information
QuangHaiNguyen authored Mar 3, 2024
2 parents 9326227 + eab73d2 commit f262a76
Show file tree
Hide file tree
Showing 127 changed files with 90 additions and 49 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
include(CTest)
endif()

add_subdirectory(ezmsdk)
add_subdirectory(easy_embedded)
add_subdirectory(extern)

add_executable(main
targets/linux/main.c
)

target_include_directories(main PRIVATE ezmsdk)
target_include_directories(main PRIVATE easy_embedded)

target_link_libraries(main PRIVATE sdk)
target_link_libraries(main PRIVATE easy_embedded_lib)

if(BUILD_TESTING)
add_subdirectory(tests)
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.

INPUT = ezmsdk
INPUT = easy_embedded

# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
Expand Down
75 changes: 75 additions & 0 deletions easy_embedded/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# ----------------------------------------------------------------------------
# Author: Hai Nguyen
# Name: easy_embedded_lib
# License: This file is published under the license described in LICENSE.md
# Description: PLEASE ADD TEXT HERE
# ----------------------------------------------------------------------------

add_library(easy_embedded_lib STATIC)

message(STATUS "**********************************************************")
message(STATUS "* Generating easy_embedded library build files")
message(STATUS "**********************************************************")


set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded)


# Include --------------------------------------------------------------------
include(features.cmake)


# Sub directory --------------------------------------------------------------
add_subdirectory(targets)
add_subdirectory(utilities)
add_subdirectory(service)
add_subdirectory(app)


# Source files ---------------------------------------------------------------
target_sources(easy_embedded_lib
PRIVATE
app/ezSdk.c
)


# Definitions ----------------------------------------------------------------
target_compile_definitions(easy_embedded_lib
PUBLIC
# Please add definitions here
PRIVATE
WINDOWS_TARGET=$<BOOL:${ENABLE_WINDOWS_TARGET}>
LINUX_TARGET=$<BOOL:${ENABLE_LINUX_TARGET}>
EMBEDDED_TARGET=$<BOOL:${ENABLE_EMBEDDED_TARGET}>
)


# Include directory -----------------------------------------------------------
target_include_directories(easy_embedded_lib
PUBLIC
${CMAKE_CURRENT_LIST_DIR}
${FRAMEWORK_ROOT_DIR}
PRIVATE
# Please add private folders here
INTERFACE
# Please add interface folders here
)


# Link libraries -------------------------------------------------------------
target_link_libraries(easy_embedded_lib
PUBLIC
ez_utilities_lib
$<$<BOOL:${ENABLE_EZ_EVENT_NOTIFIER}>:ez_event_notifier_lib>
$<$<BOOL:${ENABLE_EZ_KERNEL}>:ez_kernel>
$<$<BOOL:${ENABLE_EZ_HAL_DRIVER}>:ez_driver>
$<$<BOOL:${ENABLE_DATA_MODEL}>:ez_data_model_lib>
$<$<BOOL:${ENABLE_LITTLE_FS}>:littlefs>
ez_app
PRIVATE
# Please add private libraries
INTERFACE
# Please add interface libraries
)

# End of file
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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}/ezmsdk)
set(FRAMEWORK_ROOT_DIR ${CMAKE_SOURCE_DIR}/easy_embedded)


# Source files ---------------------------------------------------------------
Expand Down Expand Up @@ -54,7 +54,7 @@ target_include_directories(ez_utilities_lib
${CMAKE_CURRENT_LIST_DIR}/static_alloc
${CMAKE_CURRENT_LIST_DIR}/system_error
${CMAKE_CURRENT_LIST_DIR}/queue
${FRAMEWORK_ROOT_DIR}/ezApp
${FRAMEWORK_ROOT_DIR}/app
)


Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
33 changes: 0 additions & 33 deletions ezmsdk/CMakeLists.txt

This file was deleted.

2 changes: 1 addition & 1 deletion targets/linux/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/******************************************************************************
* Includes
*******************************************************************************/
#include "ezApp/ezSdk.h"
#include "app/ezSdk.h"

/******************************************************************************
* Module Preprocessor Macros
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ target_include_directories(ez_unit_test PRIVATE
../ezmsdk
)

target_link_libraries(ez_unit_test PUBLIC unity sdk)
target_link_libraries(ez_unit_test PUBLIC unity easy_embedded_lib)

# activate test depend on the activated module
if(ENABLE_EZ_EVENT_NOTIFIER)
Expand Down
3 changes: 1 addition & 2 deletions tests/main.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "ezApp/ezSdk.h"
#include "ezApp/ezSdk_config.h"
#include "app/ezSdk_config.h"
#include "unity.h"
#include "unity_fixture.h"

Expand Down
2 changes: 1 addition & 1 deletion tests/service/event_notifier/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ target_include_directories(ez_unit_test_event_notifier PRIVATE
.
../../../ezmsdk)

target_link_libraries(ez_unit_test_event_notifier PRIVATE unity sdk)
target_link_libraries(ez_unit_test_event_notifier PRIVATE unity easy_embedded_lib)

target_compile_definitions(ez_unit_test_event_notifier
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion tests/service/event_notifier/Test_ezEventNotifier.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "service/event_notifier/ez_event_notifier.h"
#include "ezApp/ezSdk_config.h"
#include "app/ezSdk_config.h"

#if(EZ_EVENT_NOTIFIER == 1)

Expand Down
2 changes: 1 addition & 1 deletion tests/service/event_notifier/Test_ezEventNotifier_Runner.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/******************************************************************************
* Includes
*******************************************************************************/
#include "ezApp/ezSdk_config.h"
#include "app/ezSdk_config.h"

#if(EZ_EVENT_NOTIFIER == 1)

Expand Down
2 changes: 1 addition & 1 deletion tests/utilities/queue/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ target_include_directories(ez_unit_test_queue PRIVATE
.
../../../ezmsdk)

target_link_libraries(ez_unit_test_queue PRIVATE unity sdk)
target_link_libraries(ez_unit_test_queue PRIVATE unity easy_embedded_lib)

target_compile_definitions(ez_unit_test_queue
PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion tests/utilities/queue/Test_ezQueue.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/******************************************************************************
* Includes
*******************************************************************************/
#include "ezApp/ezSdk_config.h"
#include "app/ezSdk_config.h"

#if (EZ_QUEUE == 1U)

Expand Down
2 changes: 1 addition & 1 deletion tests/utilities/queue/Test_ezQueue_Runner.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
/******************************************************************************
* Includes
*******************************************************************************/
#include "ezApp/ezSdk_config.h"
#include "app/ezSdk_config.h"

#if (EZ_QUEUE == 1U)
#include "unity.h"
Expand Down

0 comments on commit f262a76

Please sign in to comment.