From d282acb9713a8e292d06e2be57fb142175010faa Mon Sep 17 00:00:00 2001 From: Fritz Mueller Date: Sun, 27 Jul 2025 04:32:41 +0000 Subject: [PATCH 1/2] Update to cmake 3.12 or later --- CMakeLists.txt | 2 +- python/lsst/log/CMakeLists.txt | 1 + tests/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e4d35c..3c0a9cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.12) project(log) enable_testing() diff --git a/python/lsst/log/CMakeLists.txt b/python/lsst/log/CMakeLists.txt index 66516a3..e5da308 100644 --- a/python/lsst/log/CMakeLists.txt +++ b/python/lsst/log/CMakeLists.txt @@ -1,3 +1,4 @@ +find_package(Python COMPONENTS Development Interpreter) add_subdirectory(log) install( diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c34918d..e33ee97 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(Boost REQUIRED COMPONENTS +find_package(Boost REQUIRED NO_MODULE COMPONENTS unit_test_framework REQUIRED ) From af6240e5209b853d8b1d0de46fa4957be7541380 Mon Sep 17 00:00:00 2001 From: Fritz Mueller Date: Sun, 27 Jul 2025 05:30:58 +0000 Subject: [PATCH 2/2] Hint github cmake workflow to use downrev python if present --- .github/workflows/cmake.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cmake.yaml b/.github/workflows/cmake.yaml index f4dbb00..656d19b 100644 --- a/.github/workflows/cmake.yaml +++ b/.github/workflows/cmake.yaml @@ -46,6 +46,7 @@ jobs: run: | cmake \ -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/build/install \ + -DPython_FIND_STRATEGY=LOCATION \ -B ${{github.workspace}}/build - name: CMake build