Skip to content

Commit 5305a12

Browse files
maribucrasbe
andcommitted
pkg: Add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to cmake flags
This disable policy enforcement of newer cmake 4.1.2 on older cmake projects. The flags can be removed once the upstream projects are compatible with newer versions of cmake. Co-authored-by: crasbe <[email protected]>
1 parent c699e2e commit 5305a12

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

pkg/ccn-lite/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@ $(BINDIR)/ccn-lite.a: $(PKG_BUILD_DIR)/lib/libccnl-riot.a
2727
$(PKG_BUILD_DIR)/lib/libccnl-riot.a: $(PKG_BUILD_DIR)/Makefile
2828
$(MAKE) -C $(PKG_BUILD_DIR)
2929

30+
# TODO: Drop `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` once upstream is compatible
31+
# with newer cmake (e.g. compilation still succeeds with cmake 4.x)
3032
$(PKG_BUILD_DIR)/Makefile: $(PKG_PREPARED) $(TOOLCHAIN_FILE) | ..cmake_version_supported
3133
cmake -B$(PKG_BUILD_DIR) -H$(PKG_SOURCE_DIR)/src \
3234
-DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) \
35+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
3336
-DCCNL_RIOT=1 -DRIOT_CFLAGS="$(RIOT_CFLAGS)" -DBUILD_TESTING=OFF
3437

3538
$(TOOLCHAIN_FILE): FORCE

pkg/cryptoauthlib/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,11 @@ cryptoauth: $(PKG_BUILD_DIR)/Makefile
3636
$(MAKE) -C $(PKG_BUILD_DIR)
3737
cp $(PKG_BUILD_DIR)/libcryptoauth.a $(BINDIR)/$(PKG_NAME).a
3838

39+
# TODO: Drop `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` once upstream is compatible
40+
# with newer cmake (e.g. compilation still succeeds with cmake 4.x)
3941
$(PKG_BUILD_DIR)/Makefile: $(TOOLCHAIN_FILE)
4042
cmake -DCMAKE_TOOLCHAIN_FILE=$(TOOLCHAIN_FILE) \
43+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
4144
-Wno-dev \
4245
-DATCA_NO_HEAP:BOOL=TRUE \
4346
-B$(PKG_BUILD_DIR) \

pkg/jerryscript/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,15 @@ $(BINDIR)/jerryscript.a: $(PKG_BUILD_DIR)/Makefile
4646
@cp $(PKG_BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a
4747
@cp $(PKG_BUILD_DIR)/lib/libjerry-port-default.a $(BINDIR)/jerryscript-port-default.a
4848

49+
# TODO: Drop `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` once upstream is compatible
50+
# with newer cmake (e.g. compilation still succeeds with cmake 4.x)
4951
$(PKG_BUILD_DIR)/Makefile:
5052
cmake -B$(PKG_BUILD_DIR) -H$(PKG_SOURCE_DIR) \
5153
-DCMAKE_SYSTEM_NAME=RIOT \
5254
-DCMAKE_SYSTEM_PROCESSOR="$(MCPU)" \
5355
-DCMAKE_C_COMPILER=$(CC) \
5456
-DCMAKE_C_COMPILER_WORKS=TRUE \
57+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
5558
-DENABLE_LTO=OFF \
5659
-DENABLE_AMALGAM=OFF \
5760
-DHAVE_TIME_H=0 \

pkg/openthread/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ $(BINDIR)/openthread-$(TD).a: $(OT_CORE_LIB_DIR)/libopenthread-$(TD).a
6464
$(OT_CORE_LIB_DIR)/libopenthread-$(TD).a: $(PKG_BUILD_DIR)/Makefile
6565
$(QQ)"$(MAKE)" -C $(PKG_BUILD_DIR) $(OT_MODULES)
6666

67+
# TODO: Drop `-DCMAKE_POLICY_VERSION_MINIMUM=3.5` once upstream is compatible
68+
# with newer cmake (e.g. compilation still succeeds with cmake 4.x)
6769
$(PKG_BUILD_DIR)/Makefile:
6870
cmake -Wno-dev -B$(PKG_BUILD_DIR) -H$(PKG_SOURCE_DIR) \
6971
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
@@ -75,6 +77,7 @@ $(PKG_BUILD_DIR)/Makefile:
7577
-DCMAKE_CXX_FLAGS="$(OT_C_FLAGS) $(OT_CXXFLAGS) -fno-exceptions -fno-rtti" \
7678
-DCMAKE_NM="$(NM)" \
7779
-DCMAKE_STRIP="$(STRIP)" \
80+
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
7881
-DOT_PLATFORM=NO \
7982
-DOT_CONFIG="$(RIOTBASE)/pkg/openthread/include/platform_config.h" \
8083
-DOT_APP_CLI=$(OT_APP_CLI) \

0 commit comments

Comments
 (0)