From d85b802d8838cf2e73e8198fd0ada4c718fa633f Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Mon, 4 May 2026 12:11:17 -0400 Subject: [PATCH] Update CMake demo for CMake 4.3 CMake 4.3 made CPS support non-experimental, and also slightly altered the interface. Update example to require CMake 4.3, and to use the new interface. This also allows us to drop the experimental opt-in logic. --- cmake/zdemo/CMakeLists.txt | 2 +- cmake/zdemo/ztest/CMakeLists.txt | 6 +----- cmake/zdemo/zwrap/CMakeLists.txt | 10 ++-------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/cmake/zdemo/CMakeLists.txt b/cmake/zdemo/CMakeLists.txt index 1ffe1b1..bc0de1d 100644 --- a/cmake/zdemo/CMakeLists.txt +++ b/cmake/zdemo/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 4.0) +cmake_minimum_required(VERSION 4.3) project(zdemo) include(ExternalProject) diff --git a/cmake/zdemo/ztest/CMakeLists.txt b/cmake/zdemo/ztest/CMakeLists.txt index 13cac59..1bf6a52 100644 --- a/cmake/zdemo/ztest/CMakeLists.txt +++ b/cmake/zdemo/ztest/CMakeLists.txt @@ -1,8 +1,4 @@ -cmake_minimum_required(VERSION 4.0) -set( - CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES - "e82e467b-f997-4464-8ace-b00808fff261" - ) +cmake_minimum_required(VERSION 4.3) project(ztest CXX) diff --git a/cmake/zdemo/zwrap/CMakeLists.txt b/cmake/zdemo/zwrap/CMakeLists.txt index 651001d..044d328 100644 --- a/cmake/zdemo/zwrap/CMakeLists.txt +++ b/cmake/zdemo/zwrap/CMakeLists.txt @@ -1,8 +1,4 @@ -cmake_minimum_required(VERSION 4.0) -set( - CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO - "b80be207-778e-46ba-8080-b23bba22639e" - ) +cmake_minimum_required(VERSION 4.3) project(zwrap CXX) @@ -26,6 +22,4 @@ install( EXPORT zwrap ) -if(CMAKE_VERSION VERSION_GREATER_EQUAL 4.1) - export(EXPORT zwrap PACKAGE_INFO zwrap) -endif() +export(PACKAGE_INFO zwrap EXPORT zwrap)