mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 23:34:31 +04:00
5d89b68cec
Backport upstream commit to adust to cmake 4.x requirements. (modify patch to overlook missing intermediate commits. Remove inactive maintainer. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 52b803f57a1f4d23471f5c5f77e1a21e0721ea0e Mon Sep 17 00:00:00 2001
|
|
From: Sidney Markowitz <sidney@sidney.com>
|
|
Date: Sun, 11 May 2025 15:55:19 +1200
|
|
Subject: [PATCH] Update for cmake 4
|
|
|
|
---
|
|
CMakeLists.txt | 4 ++--
|
|
cmake/SndFileChecks.cmake | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1,4 +1,4 @@
|
|
-cmake_minimum_required (VERSION 3.1..3.18)
|
|
+cmake_minimum_required (VERSION 3.5...4.0)
|
|
|
|
# MSVC runtime library flags are selected by an abstraction, CMake >= 3.15
|
|
# This policy still need to be set even with cmake_minimum_required() command above.
|
|
@@ -487,7 +487,7 @@ if (BUILD_SHARED_LIBS)
|
|
if (DEFINED SYMBOL_OS)
|
|
add_custom_command (
|
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}
|
|
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/create_symbols_file.py ${SYMBOL_OS} ${SNDFILE_ABI_VERSION} > ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}
|
|
+ COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/create_symbols_file.py ${SYMBOL_OS} ${SNDFILE_ABI_VERSION} > ${CMAKE_CURRENT_BINARY_DIR}/src/${SYMBOL_FILENAME}
|
|
COMMENT "Generating ${SYMBOL_FILENAME}..."
|
|
)
|
|
|
|
--- a/cmake/SndFileChecks.cmake
|
|
+++ b/cmake/SndFileChecks.cmake
|
|
@@ -252,5 +252,5 @@ if (DEFINED ENABLE_STATIC_RUNTIME)
|
|
endif ()
|
|
|
|
if (BUILD_SHARED_LIBS)
|
|
- find_package (PythonInterp REQUIRED)
|
|
+ find_package (Python REQUIRED)
|
|
endif()
|