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

Adding CMake support #68

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adding CMake support #68

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
c334136
Updated gitignore to exclude CLion build and project directories.
mica-angeli Feb 8, 2019
34c68ed
Created new CMakeLists to add CMake support for the main executable a…
mica-angeli Feb 8, 2019
fdaf97c
Changed addresses from hexadecimal to decimal representation to fix i…
mica-angeli Feb 8, 2019
880251a
Changed Kconfig address SPIFFS base address type from hex to int.
mica-angeli Feb 8, 2019
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ sdkconfig.lobo
BUILD
PBUILD
build/
cmake-build-debug/
.idea/
temp/
local/
*.dis
Expand Down
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
3 changes: 3 additions & 0 deletions components/mkspiffs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(COMPONENT_SRCDIRS "")
set(COMPONENT_ADD_INCLUDEDIRS "")
register_component()
Binary file added components/mkspiffs/src/mkspiffs
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions components/spidriver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(COMPONENT_SRCDIRS ".")
set(COMPONENT_ADD_INCLUDEDIRS ".")
register_component()
5 changes: 5 additions & 0 deletions components/spiffs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
set(COMPONENT_SRCDIRS ".")
set(COMPONENT_ADD_INCLUDEDIRS ".")
#set(COMPONENT_PRIV_INCLUDEDIRS "")
set(COMPONENT_PRIV_REQUIRES spi_flash)
register_component()
3 changes: 3 additions & 0 deletions components/spiffs_image/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(COMPONENT_SRCDIRS "")
set(COMPONENT_ADD_INCLUDEDIRS "")
register_component()
4 changes: 4 additions & 0 deletions components/tft/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set(COMPONENT_SRCDIRS ".")
set(COMPONENT_ADD_INCLUDEDIRS ".")
set(COMPONENT_PRIV_REQUIRES spidriver)
register_component()
3 changes: 3 additions & 0 deletions main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(COMPONENT_SRCDIRS ".")
set(COMPONENT_ADD_INCLUDEDIRS ".")
register_component()
8 changes: 4 additions & 4 deletions main/Kconfig.projbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down