Merge branch 'task/cmake_fix' into 'main'

cmake: Minor change to remove the example's directory name

See merge request app-frameworks/esp-matter!69
This commit is contained in:
Hrishikesh Dhayagude
2022-02-08 18:04:41 +00:00
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH})
set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip)
set(ZAP_GENERATED_PATH ${ESP_MATTER_PATH}/examples/light/main/zap-generated)
set(ZAP_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/main/zap-generated)
# This should be done before using the IDF_TARGET variable.
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+1 -1
View File
@@ -22,7 +22,7 @@ endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH})
set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip)
set(ZAP_GENERATED_PATH ${ESP_MATTER_PATH}/examples/rainmaker_light/main/zap-generated)
set(ZAP_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/main/zap-generated)
if(NOT DEFINED ENV{ESP_RMAKER_PATH})
message(FATAL_ERROR "Please set ESP_RMAKER_PATH to the path of esp-rainmaker repo")
+1 -1
View File
@@ -24,7 +24,7 @@ endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ESP_MATTER_PATH $ENV{ESP_MATTER_PATH})
set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip)
set(ZAP_GENERATED_PATH ${ESP_MATTER_PATH}/examples/zap_light/main/zap-generated)
set(ZAP_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/main/zap-generated)
# This should be done before using the IDF_TARGET variable.
include($ENV{IDF_PATH}/tools/cmake/project.cmake)