Adding CMake support loboris#68

mica-angeli · jeremyjh · commit acf567aa3b3a · 2019-09-07T20:44:53.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,8 @@ sdkconfig.lobo
 BUILD
 PBUILD
 build/
+cmake-build-debug/
+.idea/
 temp/
 local/
 *.dis
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,7 @@
+# The following lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --save-temps")
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(tft_demo)
diff --git a/components/mkspiffs/CMakeLists.txt b/components/mkspiffs/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(COMPONENT_SRCDIRS "")
+set(COMPONENT_ADD_INCLUDEDIRS "")
+register_component()
diff --git a/components/mkspiffs/src/mkspiffs b/components/mkspiffs/src/mkspiffs
diff --git a/components/spidriver/CMakeLists.txt b/components/spidriver/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(COMPONENT_SRCDIRS ".")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+register_component()
diff --git a/components/spiffs/CMakeLists.txt b/components/spiffs/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(COMPONENT_SRCDIRS ".")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+#set(COMPONENT_PRIV_INCLUDEDIRS "")
+set(COMPONENT_PRIV_REQUIRES spi_flash)
+register_component()
diff --git a/components/spiffs_image/CMakeLists.txt b/components/spiffs_image/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(COMPONENT_SRCDIRS "")
+set(COMPONENT_ADD_INCLUDEDIRS "")
+register_component()
diff --git a/components/tft/CMakeLists.txt b/components/tft/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(COMPONENT_SRCDIRS ".")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+set(COMPONENT_PRIV_REQUIRES spidriver)
+register_component()
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(COMPONENT_SRCDIRS ".")
+set(COMPONENT_ADD_INCLUDEDIRS ".")
+register_component()
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
@@ -1,9 +1,9 @@
 menu "TFT Display DEMO Configuration"
 
 config SPIFFS_BASE_ADDR
-    hex "SPIFFS Base address"
-    range 100000 1FFE000
-    default 180000
+    int "SPIFFS Base address"
+    range 1048576 33546240
+    default 1572864
     help
 	Starting address of the SPIFFS area in ESP32 Flash
 
@@ -36,7 +36,7 @@ config EXAMPLE_DISPLAY_TYPE
         default EXAMPLE_DISPLAY_TYPE0
         help
             Select predefined display configuration
-    
+
         config EXAMPLE_DISPLAY_TYPE0
             bool "None"
         config EXAMPLE_DISPLAY_TYPE1

-Original file line number
+Diff line change
 BUILD
 PBUILD
 build/
 +cmake-build-debug/
 +.idea/
 temp/
 local/
 *.dis
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+set(COMPONENT_SRCDIRS "")`
	`2`	`+set(COMPONENT_ADD_INCLUDEDIRS "")`
	`3`	`+register_component()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+set(COMPONENT_SRCDIRS ".")`
	`2`	`+set(COMPONENT_ADD_INCLUDEDIRS ".")`
	`3`	`+register_component()`