1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-27 15:31:17 +01:00

Merge pull request #21839 from maribu/pkg/cmake/fix-compilation-on-cmake-4.1.2

pkg: Add `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` to cmake flags
This commit is contained in:
Marian Buschsieweke 2025-11-03 15:54:34 +00:00 committed by GitHub
commit 5d26414ecf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 0 deletions

View File

@ -27,9 +27,12 @@ $(BINDIR)/ccn-lite.a: $(PKG_BUILD_DIR)/lib/libccnl-riot.a
$(PKG_BUILD_DIR)/lib/libccnl-riot.a: $(PKG_BUILD_DIR)/Makefile
$(MAKE) -C $(PKG_BUILD_DIR)
# TODO: Drop `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` once upstream is compatible
# with newer cmake (e.g. compilation still succeeds with cmake 4.x)
$(PKG_BUILD_DIR)/Makefile: $(PKG_PREPARED) $(TOOLCHAIN_FILE) | ..cmake_version_supported
cmake -B$(PKG_BUILD_DIR) -H$(PKG_SOURCE_DIR)/src \
-DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCCNL_RIOT=1 -DRIOT_CFLAGS="$(RIOT_CFLAGS)" -DBUILD_TESTING=OFF
$(TOOLCHAIN_FILE): FORCE

View File

@ -36,8 +36,11 @@ cryptoauth: $(PKG_BUILD_DIR)/Makefile
$(MAKE) -C $(PKG_BUILD_DIR)
cp $(PKG_BUILD_DIR)/libcryptoauth.a $(BINDIR)/$(PKG_NAME).a
# TODO: Drop `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` once upstream is compatible
# with newer cmake (e.g. compilation still succeeds with cmake 4.x)
$(PKG_BUILD_DIR)/Makefile: $(TOOLCHAIN_FILE)
cmake -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-Wno-dev \
-DATCA_NO_HEAP:BOOL=TRUE \
-B$(PKG_BUILD_DIR) \

View File

@ -46,12 +46,15 @@ $(BINDIR)/jerryscript.a: $(PKG_BUILD_DIR)/Makefile
@cp $(PKG_BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a
@cp $(PKG_BUILD_DIR)/lib/libjerry-port-default.a $(BINDIR)/jerryscript-port-default.a
# TODO: Drop `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` once upstream is compatible
# with newer cmake (e.g. compilation still succeeds with cmake 4.x)
$(PKG_BUILD_DIR)/Makefile:
cmake -B$(PKG_BUILD_DIR) -H$(PKG_SOURCE_DIR) \
-DCMAKE_SYSTEM_NAME=RIOT \
-DCMAKE_SYSTEM_PROCESSOR="$(MCPU)" \
-DCMAKE_C_COMPILER=$(CC) \
-DCMAKE_C_COMPILER_WORKS=TRUE \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DENABLE_LTO=OFF \
-DENABLE_AMALGAM=OFF \
-DHAVE_TIME_H=0 \

View File

@ -64,6 +64,8 @@ $(BINDIR)/openthread-$(TD).a: $(OT_CORE_LIB_DIR)/libopenthread-$(TD).a
$(OT_CORE_LIB_DIR)/libopenthread-$(TD).a: $(PKG_BUILD_DIR)/Makefile
$(QQ)"$(MAKE)" -C $(PKG_BUILD_DIR) $(OT_MODULES)
# TODO: Drop `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` once upstream is compatible
# with newer cmake (e.g. compilation still succeeds with cmake 4.x)
$(PKG_BUILD_DIR)/Makefile:
cmake -Wno-dev -B$(PKG_BUILD_DIR) -H$(PKG_SOURCE_DIR) \
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
@ -75,6 +77,7 @@ $(PKG_BUILD_DIR)/Makefile:
-DCMAKE_CXX_FLAGS="$(OT_C_FLAGS) $(OT_CXXFLAGS) -fno-exceptions -fno-rtti" \
-DCMAKE_NM="$(NM)" \
-DCMAKE_STRIP="$(STRIP)" \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DOT_PLATFORM=NO \
-DOT_CONFIG="$(RIOTBASE)/pkg/openthread/include/platform_config.h" \
-DOT_APP_CLI=$(OT_APP_CLI) \