From 2ae66989be11cc2810c69dff6d489e39adb4a72d Mon Sep 17 00:00:00 2001
From: ok-home <ok-home@ya.ru>
Date: Mon, 9 Oct 2023 09:38:22 +0700
Subject: [PATCH] chg Cmake

---
 CMakeLists.txt | 90 ++++++++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4baea0f..6e77c70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,46 +1,58 @@
+set( srcs
+      source/ota_ws_update_http.c 
+)
+set( includedir
+      include
+)
+set( priv_includedir 
+      private_include
+    )
+set(require 
+      ""
+)
+set( priv_require
+      esp_http_server
+      app_update
+      esp_encrypted_img
+)
+set( embed_file 
+      source/ota_ws_update.html
+)
+set( embed_txt_file 
+      ""
+)
+
 if(CONFIG_OTA_PRE_ENCRYPTED_MODE)
-  idf_component_register(
-                    SRCS 
-                      source/ota_ws_update_esp_preencrypted.c
-                      source/ota_ws_update_http.c 
-                    INCLUDE_DIRS 
-                      include
-                    PRIV_INCLUDE_DIRS
-                      private_include
-                    REQUIRES
-                      esp_http_server
-                      app_update
-                      esp_encrypted_img
-                      #esp_wifi
-                    EMBED_FILES 
-                      source/ota_ws_update.html
-                    EMBED_TXTFILES  
-                      rsa_key/private.pem
+  list(APPEND srcs 
+      source/ota_ws_update_esp_preencrypted.c 
   )
+  list(APPEND embed_txt_file 
+      rsa_key/private.pem
+  )
+else()
+  list(APPEND srcs 
+      source/ota_ws_update_esp.c
+  )
+endif()
+
+idf_component_register(
+                    SRCS ${srcs}
+                    INCLUDE_DIRS ${includedir}
+                    PRIV_INCLUDE_DIRS ${priv_includedir}
+                    REQUIRES ${require}
+                    PRIV_REQUIRES ${priv_require}
+                    EMBED_FILES ${embed_file}
+                    EMBED_TXTFILES ${embed_txt_file} 
+)
+
+if(CONFIG_OTA_PRE_ENCRYPTED_MODE)
     #openssl genrsa -out rsa_key/private.pem 3072
-    #create_esp_enc_img(${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.bin
-    #  ${project_dir}/../rsa_key/private.pem ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}_secure.bin app)
-    # for rsa_key on components dir  ?
+
+    # for rsa_key on components dir  
     create_esp_enc_img(${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.bin
       ${COMPONENT_DIR}/rsa_key/private.pem ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}_secure.bin app)
-    # for rsa_key on project dir  ?
+
+    # for rsa_key on project dir  
     #create_esp_enc_img(${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.bin
     #  ${project_dir}/rsa_key/private.pem ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}_secure.bin app)
-
-else()
-  idf_component_register(
-                    SRCS 
-                      source/ota_ws_update_esp.c
-                      source/ota_ws_update_http.c 
-                    INCLUDE_DIRS 
-                      include
-                    PRIV_INCLUDE_DIRS
-                      private_include
-                    REQUIRES
-                      esp_http_server
-                      app_update
-                      #esp_wifi
-                    EMBED_FILES 
-                      source/ota_ws_update.html
-  )
-endif()
\ No newline at end of file
+endif()