From c070e7152b7dc4513e75aa13f9020162378a6f19 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Tue, 12 May 2020 00:22:37 +0300 Subject: [PATCH] fix cmake check --- .github/scripts/check-cmakelists.sh | 4 ++-- .../examples/Camera/CameraWebServer/CameraWebServer.ino | 5 ++++- .../ESP32/examples/Camera/CameraWebServer/app_httpd.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/scripts/check-cmakelists.sh b/.github/scripts/check-cmakelists.sh index 88eb3dfb..8495667b 100755 --- a/.github/scripts/check-cmakelists.sh +++ b/.github/scripts/check-cmakelists.sh @@ -15,9 +15,9 @@ git submodule update --init --recursive REPO_SRCS=`find cores/esp32/ libraries/ -name 'examples' -prune -o -name '*.c' -print -o -name '*.cpp' -print | sort` # find all source files named in CMakeLists.txt COMPONENT_SRCS -CMAKE_SRCS=`cmake --trace-expand -C CMakeLists.txt 2>&1 | grep COMPONENT_SRCS | sed 's/.\+COMPONENT_SRCS //' | sed 's/ )//' | tr ' ;' '\n' | sort` +CMAKE_SRCS=`cmake --trace-expand -C CMakeLists.txt 2>&1 | grep set\(srcs | cut -d'(' -f3 | sed 's/ )//' | sed 's/srcs //' | tr ' ;' '\n' | sort` -if ! diff -u0 --label "Repo Files" --label "COMPONENT_SRCS" <(echo "$REPO_SRCS") <(echo "$CMAKE_SRCS"); then +if ! diff -u0 --label "Repo Files" --label "srcs" <(echo "$REPO_SRCS") <(echo "$CMAKE_SRCS"); then echo "Source files in repo (-) and source files in CMakeLists.txt (+) don't match" echo "Edit CMakeLists.txt as appropriate to add/remove source files from COMPONENT_SRCS" exit 1 diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino b/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino index bbd000e4..ef86f85e 100644 --- a/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino +++ b/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino @@ -112,4 +112,7 @@ void loop() { // put your main code here, to run repeatedly: delay(10000); } -#endif \ No newline at end of file +#else +void setup(){} +void loop(){} +#endif diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp b/libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp index c954d8a2..5673251c 100644 --- a/libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp +++ b/libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp @@ -661,4 +661,4 @@ void startCameraServer(){ httpd_register_uri_handler(stream_httpd, &stream_uri); } } -#endif \ No newline at end of file +#endif