Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added custom find_package_me cmake function to templates #107

Merged
merged 4 commits into from
Oct 17, 2024
Merged

Added custom find_package_me cmake function to templates #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45362ed
find_package_me added to templates
IvanRuzavin Oct 17, 2024
8cc6823
Removed TODO comment
IvanRuzavin Oct 17, 2024
4bdcb3b
Merge remote-tracking branch 'origin/master' into improvement/better-…
IvanRuzavin Oct 17, 2024
8e41e64
Removed checks for Core and System
IvanRuzavin Oct 17, 2024
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
3 changes: 0 additions & 3 deletions templates/necto/project_templates/0_mikrosdk2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ endif()

include(mikroeUtils)

# TODO - Temporary fix, remove with NECTO release 7.0.4+
if (${MIKROSDK_TYPE} STREQUAL "legacy")
legacy_cmake_path()
endif()
Expand All @@ -19,14 +18,12 @@ add_executable(${PROJECT_NAME} main.c)
############################ ${PROJECT_NAME} GENERATED CODE START ###########################
############################ ${PROJECT_NAME} GENERATED CODE END ###########################

find_package(MikroC.Core REQUIRED)
target_link_libraries(${PROJECT_NAME}
PUBLIC
MikroC.Core
)

if (${MIKROSDK_TYPE} STREQUAL "legacy")
find_package(MikroC.System REQUIRED)
target_link_libraries(${PROJECT_NAME}
PUBLIC
MikroC.System
Expand Down
10 changes: 5 additions & 5 deletions templates/necto/project_templates/1_designer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ add_executable(${PROJECT_NAME}

designer_generator(${PROJECT_NAME} resource.mres main_screen.mscr)
############################ ${PROJECT_NAME} GENERATED CODE START ###########################
find_package(MikroC.Core REQUIRED)
find_package(MikroSDK.TouchController REQUIRED)
find_package(MikroSDK.GraphicLibrary REQUIRED)
find_package(MikroSDK.VisualTft REQUIRED)
############################ ${PROJECT_NAME} GENERATED CODE END ###########################

find_package_me(MikroSDK.TouchController REQUIRED)
find_package_me(MikroSDK.GraphicLibrary REQUIRED)
find_package_me(MikroSDK.VisualTft REQUIRED)

target_link_libraries(${PROJECT_NAME}
PUBLIC
Expand All @@ -30,7 +31,6 @@ target_link_libraries(${PROJECT_NAME}
MikroSDK.GraphicLibrary
MikroSDK.VisualTft
)
############################ ${PROJECT_NAME} GENERATED CODE END ###########################

if(COMPILER_REVISION)
if(${COMPILER_REVISION} VERSION_GREATER_EQUAL "1.0")
Expand Down
10 changes: 6 additions & 4 deletions templates/necto/project_templates/2_lvgl_designer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@ add_executable(${PROJECT_NAME}
)

set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS resource.mres)
############################ ${PROJECT_NAME} GENERATED CODE START ###########################
############################ ${PROJECT_NAME} GENERATED CODE END ###########################

find_package(MikroSDK.LVGL.Common REQUIRED)
find_package(MikroSDK.GraphicLibrary REQUIRED)
find_package(MikroC.Core REQUIRED)
find_package(MikroSDK.LVGL)

find_package_me(MikroSDK.LVGL.Common REQUIRED)
find_package_me(MikroSDK.GraphicLibrary REQUIRED)
find_package_me(MikroSDK.LVGL)

lvgl_designer_generator(${PROJECT_NAME} resource.mres main_screen.mscr)

Expand Down
3 changes: 0 additions & 3 deletions templates/necto/project_templates/3_library_sdk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ endif()

include(mikroeUtils)

# TODO - Temporary fix, remove with NECTO release 7.0.4+
if (${MIKROSDK_TYPE} STREQUAL "legacy")
legacy_cmake_path()
endif()
Expand All @@ -19,14 +18,12 @@ add_library(${PROJECT_NAME} STATIC lib.c lib.h)
############################ ${PROJECT_NAME} GENERATED CODE START ###########################
############################ ${PROJECT_NAME} GENERATED CODE END ###########################

find_package(MikroC.Core REQUIRED)
target_link_libraries(${PROJECT_NAME}
PUBLIC
MikroC.Core
)

if (${MIKROSDK_TYPE} STREQUAL "legacy")
find_package(MikroC.System REQUIRED)
target_link_libraries(${PROJECT_NAME}
PUBLIC
MikroC.System
Expand Down
3 changes: 0 additions & 3 deletions templates/necto/project_templates/4_application_with_library/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ endif()

include(mikroeUtils)

# TODO - Temporary fix, remove with NECTO release 7.0.4+
if (${MIKROSDK_TYPE} STREQUAL "legacy")
legacy_cmake_path()
endif()
Expand All @@ -19,15 +18,13 @@ add_executable(${PROJECT_NAME}_example main.c)
############################ ${PROJECT_NAME} GENERATED CODE START ###########################
############################ ${PROJECT_NAME} GENERATED CODE END ###########################

find_package(MikroC.Core REQUIRED)
target_link_libraries(${PROJECT_NAME}_example
PUBLIC
MikroC.Core
${PROJECT_NAME}
)

if (${MIKROSDK_TYPE} STREQUAL "legacy")
find_package(MikroC.System REQUIRED)
target_link_libraries(${PROJECT_NAME}_example
PUBLIC
MikroC.System
Expand Down
2 changes: 0 additions & 2 deletions templates/necto/project_templates/4_library_with_example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@ add_executable(${PROJECT_NAME}_example main.c)
############################ ${PROJECT_NAME} GENERATED CODE START ###########################
############################ ${PROJECT_NAME} GENERATED CODE END ###########################

find_package(MikroC.Core REQUIRED)
target_link_libraries(${PROJECT_NAME}_example
PUBLIC
MikroC.Core
${PROJECT_NAME}
)

if (${MIKROSDK_TYPE} STREQUAL "legacy")
find_package(MikroC.System REQUIRED)
target_link_libraries(${PROJECT_NAME}_example
PUBLIC
MikroC.System
Expand Down
Loading