Merge pull request #107 from MikroElektronika/improvement/better-erro…

…r-handling Added custom find_package_me cmake function to templates
MikroElektronika · Oct 17, 2024 · 70660f5 · 70660f5
2 parents a8449f3 + 8e41e64
commit 70660f5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/templates/necto/project_templates/0_mikrosdk2/CMakeLists.txt b/templates/necto/project_templates/0_mikrosdk2/CMakeLists.txt
@@ -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()
@@ -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

diff --git a/templates/necto/project_templates/1_designer/CMakeLists.txt b/templates/necto/project_templates/1_designer/CMakeLists.txt
@@ -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
@@ -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")

diff --git a/templates/necto/project_templates/2_lvgl_designer/CMakeLists.txt b/templates/necto/project_templates/2_lvgl_designer/CMakeLists.txt
@@ -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)
 

diff --git a/templates/necto/project_templates/3_library_sdk/CMakeLists.txt b/templates/necto/project_templates/3_library_sdk/CMakeLists.txt
@@ -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()
@@ -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

diff --git a/templates/necto/project_templates/4_application_with_library/CMakeLists.txt b/templates/necto/project_templates/4_application_with_library/CMakeLists.txt
@@ -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()
@@ -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

diff --git a/templates/necto/project_templates/4_library_with_example/CMakeLists.txt b/templates/necto/project_templates/4_library_with_example/CMakeLists.txt
@@ -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