Skip to content

Commit

Permalink
Merge pull request #7 from project-chip/master
Browse files Browse the repository at this point in the history
merge master
  • Loading branch information
Jagadish-NXP authored May 5, 2021
2 parents d8e5ffe + ea5b53b commit 5004194
Show file tree
Hide file tree
Showing 290 changed files with 24,716 additions and 21,501 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@

name: Cirque

on:
push:
pull_request:
on: workflow_dispatch

jobs:
cirque:
Expand Down
9 changes: 9 additions & 0 deletions config/esp32/components/chip/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,19 @@ macro(chip_gn_arg_append arg val)
string(APPEND chip_gn_args "${arg} = ${val}\n")
endmacro()

macro(chip_gn_arg_bool arg boolean)
if (${boolean})
string(APPEND chip_gn_args "${arg} = true\n")
else()
string(APPEND chip_gn_args "${arg} = false\n")
endif()
endmacro()

chip_gn_arg_append("esp32_ar" "\"${CMAKE_AR}\"")
chip_gn_arg_append("esp32_cc" "\"${CMAKE_C_COMPILER}\"")
chip_gn_arg_append("esp32_cxx" "\"${CMAKE_CXX_COMPILER}\"")
chip_gn_arg_append("esp32_cpu" "\"esp32\"")
chip_gn_arg_bool("is_debug" is_debug)

if(CONFIG_ENABLE_PW_RPC)
chip_gn_arg_append("chip_build_pw_rpc_lib" "true")
Expand Down
Loading

0 comments on commit 5004194

Please sign in to comment.