From 9a1cc7c11dbee23515b121908a8d3f80eedd712a Mon Sep 17 00:00:00 2001 From: Marius Schamschula Date: Mon, 22 Jun 2026 15:16:31 -0500 Subject: [PATCH] py-pikepdf: fix CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS-NOTFOUND Closes: https://trac.macports.org/ticket/74122 See: https://www.kitware.com/import-cmake-the-experiment-is-over/ --- python/py-pikepdf/Portfile | 3 +-- .../files/patch-CMakeLists.txt.diff | 20 +++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/python/py-pikepdf/Portfile b/python/py-pikepdf/Portfile index bd8c9a60e03..d613e4aec0c 100644 --- a/python/py-pikepdf/Portfile +++ b/python/py-pikepdf/Portfile @@ -44,7 +44,6 @@ if {${name} ne ${subport}} { compiler.blacklist-append {clang < 900} # workaround for CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS-NOTFOUND - # See: https://gitlab.kitware.com/cmake/cmake/-/work_items/25956 - # See: https://www.scivision.dev/cmake-clang-scandep-workaround/ + # See: https://www.kitware.com/import-cmake-the-experiment-is-over/ patchfiles patch-CMakeLists.txt.diff } diff --git a/python/py-pikepdf/files/patch-CMakeLists.txt.diff b/python/py-pikepdf/files/patch-CMakeLists.txt.diff index f560d4d82f0..e2a5340df55 100644 --- a/python/py-pikepdf/files/patch-CMakeLists.txt.diff +++ b/python/py-pikepdf/files/patch-CMakeLists.txt.diff @@ -1,20 +1,14 @@ --- CMakeLists.txt.orig 2022-11-09 06:37:21 -+++ CMakeLists.txt 2026-05-25 09:01:24 -@@ -2,8 +2,17 @@ ++++ CMakeLists.txt 2026-06-22 15:10:29 +@@ -1,8 +1,10 @@ + # SPDX-FileCopyrightText: 2022 James R. Barlow # SPDX-License-Identifier: MPL-2.0 - cmake_minimum_required(VERSION 3.15...3.30) -+ +-cmake_minimum_required(VERSION 3.15...3.30) ++cmake_minimum_required(VERSION 3.28) project(pikepdf LANGUAGES CXX) - -+if(${PROJECT_NAME}_cxx) # arbitrary user option -+ set(CMAKE_CXX_SCAN_FOR_MODULES OFF) # workaround CMake 3.28.0 .. 3.29.2 with Clang -+ enable_language(CXX) -+ set(CMAKE_CXX_SCAN_FOR_MODULES ON) # optional, if project actually uses C++ modules -+endif() -+ +set(CMAKE_CXX_STANDARD 20) -+ ++set(CMAKE_CXX_SCAN_FOR_MODULES OFF) + find_package(Python 3.10 REQUIRED COMPONENTS Interpreter Development.Module - OPTIONAL_COMPONENTS Development.SABIModule)