Merge branch 'bugfix/cmake' into 'master'

Bugfix/cmake See merge request esp-components/esp-azure!24
espressif · Oct 15, 2019 · 6f054a8 · 6f054a8
2 parents 6f570d6 + 795e1a6
commit 6f054a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/examples/prov_dev_client_ll_sample/main/CMakeLists.txt b/examples/prov_dev_client_ll_sample/main/CMakeLists.txt
@@ -4,6 +4,10 @@ set(COMPONENT_SRCS "azure_main.c"
 				)
 set(COMPONENT_ADD_INCLUDEDIRS ".")
 
+set(COMPONENT_EMBED_TXTFILES "certs/leaf_certificate.pem"
+                             "certs/leaf_private_key.pem"
+                             )
+
 register_component()
 
 component_compile_definitions(SET_TRUSTED_CERT_IN_SAMPLES)
diff --git a/examples/prov_dev_client_ll_sample/main/custom_hsm_x509.c b/examples/prov_dev_client_ll_sample/main/custom_hsm_x509.c
@@ -26,7 +26,6 @@ static const unsigned char EK[] = { 0x45, 0x6e, 0x64, 0x6f, 0x72, 0x73, 0x65, 0x
 static const size_t EK_LEN = sizeof(EK)/sizeof(EK[0]);
 static const unsigned char SRK[] = { 0x53, 0x74, 0x6f, 0x72, 0x65, 0x20, 0x72, 0x6f, 0x6f, 0x74, 0x20, 0x6b, 0x65, 0x79, 0x0d, 0x0a };
 static const size_t SRK_LEN = sizeof(SRK) / sizeof(SRK[0]);
-static const unsigned char ENCRYPTED_DATA[] = { 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x65, 0x64, 0x20, 0x64, 0x61, 0x74, 0x61, 0x0d, 0x0a };
 
 typedef struct CUSTOM_HSM_SAMPLE_INFO_TAG
 {

diff --git a/port/CMakeLists.txt b/port/CMakeLists.txt
@@ -8,7 +8,6 @@ set (COMPONENT_ADD_INCLUDEDIRS
     "inc"
     "${AZURE_IOT_SDK}/certs"
 	"${AZURE_IOT_SDK}/c-utility/inc"
-	"${AZURE_IOT_SDK}/c-utility/inc/azure_c_shared_utility"
 	"${AZURE_IOT_SDK}/c-utility/pal/inc"
 	"${AZURE_IOT_SDK}/c-utility/pal/freertos"
 	"${AZURE_IOT_SDK}/c-utility/pal/generic"
@@ -118,7 +117,7 @@ endif()
 
 set (COMPONENT_SUBMODULES "${AZURE_IOT_SDK}")
 
-set(COMPONENT_PRIV_REQUIRES "mbedtls esp-tls")
+set(COMPONENT_PRIV_REQUIRES "mbedtls esp-tls main")
 
 register_component()
 
@@ -135,5 +134,5 @@ component_compile_definitions (
 )
 
 if (CONFIG_DEVICE_COMMON_NAME)
-	add_compile_options(-DUSE_PROV_MODULE)
+	add_definitions(-DUSE_PROV_MODULE)
 endif()