Skip to content

Commit d750923

Browse files
committed
Set CMAKE_POLICY_VERSION_MINIMUM=3.5 for ESP-IDF and Zephyr
Signed-off-by: David Laseca Perez <davidlaseca@eprosima.com>
1 parent c58420a commit d750923

3 files changed

Lines changed: 15 additions & 0 deletions

File tree

‎config/freertos/esp32/build.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ source $FW_TARGETDIR/venv/bin/activate
88
export IDF_TOOLS_PATH=$FW_TARGETDIR/toolchain/espressif
99
export IDF_PATH=$FW_TARGETDIR/toolchain/esp-idf
1010

11+
# ESP-IDF v4.1 vendors third-party trees (mbedtls) whose cmake_minimum_required
12+
# predates 3.5, which CMake 4 rejects outright. Restore the old floor until the
13+
# pinned ESP-IDF is bumped.
14+
export CMAKE_POLICY_VERSION_MINIMUM=3.5
15+
1116
eval $(python3 $FW_TARGETDIR/toolchain/esp-idf/tools/idf_tools.py export --prefer-system)
1217

1318
. $IDF_PATH/export.sh

‎config/freertos/esp32/configure.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ UROS_APP_FOLDER="$FW_TARGETDIR/freertos_apps/apps/$UROS_APP"
5757
export IDF_TOOLS_PATH=$FW_TARGETDIR/toolchain/espressif
5858
export IDF_PATH=$FW_TARGETDIR/toolchain/esp-idf
5959

60+
# ESP-IDF v4.1 vendors third-party trees (mbedtls) whose cmake_minimum_required
61+
# predates 3.5, which CMake 4 rejects outright. Restore the old floor until the
62+
# pinned ESP-IDF is bumped.
63+
export CMAKE_POLICY_VERSION_MINIMUM=3.5
64+
6065
eval $(python3 $FW_TARGETDIR/toolchain/esp-idf/tools/idf_tools.py export --prefer-system)
6166

6267
. $IDF_PATH/export.sh

‎config/zephyr/generic/build.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ pushd $FW_TARGETDIR >/dev/null
99
export ZEPHYR_SDK_INSTALL_DIR=$FW_TARGETDIR/zephyr-sdk
1010
export PATH=~/.local/bin:"$PATH"
1111

12+
# Zephyr v2.6.0 vendors third-party modules (civetweb) whose
13+
# cmake_minimum_required predates 3.5, which CMake 4 rejects outright.
14+
# Restore the old floor until the pinned Zephyr is bumped.
15+
export CMAKE_POLICY_VERSION_MINIMUM=3.5
16+
1217

1318
# Retrieve user app
1419
unset UROS_APP

0 commit comments

Comments
 (0)