Merge pull request lvgl#265 from tore-espressif/feature/clean_build

Remove Extra component dirs definition

Author: C47D

CMakeLists.txt

@@ -2,8 +2,7 @@ cmake_minimum_required(VERSION 3.5)
 
 if (NOT DEFINED PROJECT_NAME)
     include($ENV{IDF_PATH}/tools/cmake/project.cmake)
- 
-    list(APPEND EXTRA_COMPONENT_DIRS components/lvgl_esp32_drivers components/lvgl_esp32_drivers/lvgl_touch components/lvgl_esp32_drivers/lvgl_tft)
-
     project(lvgl-demo)
-endif (NOT DEFINED PROJECT_NAME)
+else()
+    message(FATAL_ERROR "LV PORT ESP32: This must be a project's main CMakeLists.txt.")
+endif()

Makefile

@@ -4,12 +4,4 @@
 #
 
 PROJECT_NAME := lvgl-demo
-
-# Add new components (source folders)
-EXTRA_COMPONENT_DIRS := components/lvgl_esp32_drivers/lvgl_tft
-EXTRA_COMPONENT_DIRS += components/lvgl_esp32_drivers/lvgl_touch
-# Must be before include $(IDF_PATH)/make/project.mk
-# $(PROJECT_PATH)/xxx didn't work -> use $(abspath xxx) instead
-
 include $(IDF_PATH)/make/project.mk
-

components/lv_examples/CMakeLists.txt

@@ -6,4 +6,6 @@ idf_component_register(SRCS ${SOURCES}
                        INCLUDE_DIRS .
                        REQUIRES lvgl)
 
+else()
+    message(FATAL_ERROR "LVGL LV examples: ESP_PLATFORM is not defined. Try reinstalling ESP-IDF.")
 endif()

components/lv_examples/component.mk

@@ -2,7 +2,7 @@
 # Component Makefile
 #
 
-CFLAGS += -DLV_CONF_INCLUDE_SIMPLE
+CFLAGS += -DLV_LVGL_H_INCLUDE_SIMPLE
 
 COMPONENT_SRCDIRS := lv_examples           \
     lv_examples/src/lv_demo_benchmark      \

main/CMakeLists.txt

@@ -1,5 +1 @@
-set(SOURCES main.c)
-idf_component_register(SRCS ${SOURCES}
-                    INCLUDE_DIRS .)
-
-target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_LVGL_H_INCLUDE_SIMPLE")
+idf_component_register(SRCS main.c)

main/component.mk

@@ -3,5 +3,4 @@
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
-CFLAGS += -DLV_CONF_INCLUDE_SIMPLE
-CFLAGS += -DLV_LVGL_H_INCLUDE_SIMPLE
+CFLAGS+= -DLV_LVGL_H_INCLUDE_SIMPLE

main/main.c

@@ -21,7 +21,7 @@
 #include "driver/gpio.h"
 
 /* Littlevgl specific */
-#ifdef LV_CONF_INCLUDE_SIMPLE
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
 #include "lvgl.h"
 #else
 #include "lvgl/lvgl.h"