Skip to content

Commit 256d716

Browse files
author
summivox
committed
remove backwards dependency on main component
1 parent 3461fef commit 256d716

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

CMakeLists.txt

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,30 @@ set(LIBRARY_SRCS
5454
libraries/HTTPUpdate/src/HTTPUpdate.cpp
5555
libraries/Preferences/src/Preferences.cpp
5656
libraries/SD_MMC/src/SD_MMC.cpp
57-
libraries/SD/src/SD.cpp
58-
libraries/SD/src/sd_diskio.cpp
5957
libraries/SD/src/sd_diskio_crc.c
58+
libraries/SD/src/sd_diskio.cpp
59+
libraries/SD/src/SD.cpp
6060
libraries/SimpleBLE/src/SimpleBLE.cpp
61-
libraries/SPIFFS/src/SPIFFS.cpp
6261
libraries/SPI/src/SPI.cpp
62+
libraries/SPIFFS/src/SPIFFS.cpp
6363
libraries/Ticker/src/Ticker.cpp
64-
libraries/Update/src/Updater.cpp
6564
libraries/Update/src/HttpsOTAUpdate.cpp
66-
libraries/WebServer/src/WebServer.cpp
67-
libraries/WebServer/src/Parsing.cpp
65+
libraries/Update/src/Updater.cpp
6866
libraries/WebServer/src/detail/mimetable.cpp
69-
libraries/WiFiClientSecure/src/ssl_client.cpp
70-
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
67+
libraries/WebServer/src/Parsing.cpp
68+
libraries/WebServer/src/WebServer.cpp
7169
libraries/WiFi/src/ETH.cpp
70+
libraries/WiFi/src/WiFi.cpp
7271
libraries/WiFi/src/WiFiAP.cpp
7372
libraries/WiFi/src/WiFiClient.cpp
74-
libraries/WiFi/src/WiFi.cpp
7573
libraries/WiFi/src/WiFiGeneric.cpp
7674
libraries/WiFi/src/WiFiMulti.cpp
7775
libraries/WiFi/src/WiFiScan.cpp
7876
libraries/WiFi/src/WiFiServer.cpp
7977
libraries/WiFi/src/WiFiSTA.cpp
8078
libraries/WiFi/src/WiFiUdp.cpp
79+
libraries/WiFiClientSecure/src/ssl_client.cpp
80+
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp
8181
libraries/WiFiProv/src/WiFiProv.cpp
8282
libraries/Wire/src/Wire.cpp
8383
)
@@ -146,10 +146,16 @@ set(includedirs
146146
libraries/Wire/src
147147
)
148148

149+
set(esp_requires
150+
esp_http_client
151+
esp_https_ota
152+
wifi_provisioning
153+
)
154+
149155
set(srcs ${CORE_SRCS} ${LIBRARY_SRCS} ${BLE_SRCS})
150156
set(priv_includes cores/esp32/libb64)
151157
set(requires spi_flash mbedtls mdns esp_adc_cal)
152-
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl bt tinyusb main)
158+
set(priv_requires fatfs nvs_flash app_update spiffs bootloader_support openssl bt tinyusb ${esp_requires})
153159

154160
idf_component_register(INCLUDE_DIRS ${includedirs} PRIV_INCLUDE_DIRS ${priv_includes} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
155161

0 commit comments

Comments
 (0)