1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
From 7d60bfd23433c102fcd1e19fb6ad977fa4b53517 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 27 Nov 2025 21:36:47 +0100
Subject: [PATCH] Fix build with CMake 4, fix CMP0115/CMP0127 warnings
Source: https://sourceforge.net/p/soxr/code/merge-requests/6/
But max cranked up to 3.31 for who knows when we will look at it again.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
CMakeLists.txt | 4 ++--
examples/CMakeLists.txt | 8 ++++----
src/CMakeLists.txt | 30 +++++++++++++++---------------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee48f6c..0e4db65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
# SoX Resampler Library Copyright (c) 2007-18 robs@users.sourceforge.net
# Licence for this file: LGPL v2.1 See LICENCE for details.
-cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
+cmake_minimum_required (VERSION 3.1...3.31)
project (soxr C)
set (DESCRIPTION_SUMMARY
@@ -70,7 +70,7 @@ cmake_dependent_option (WITH_AVFFT
"Use libavcodec (LGPL) for HQ SIMD DFT." OFF
"WITH_CR32S;NOT WITH_PFFFT" OFF)
cmake_dependent_option (BUILD_LSR_TESTS "Build LSR tests." OFF
- "UNIX;NOT CMAKE_CROSSCOMPILING;EXISTS ${PROJECT_SOURCE_DIR}/lsr-tests;WITH_LSR_BINDINGS" OFF)
+ "UNIX;NOT CMAKE_CROSSCOMPILING;EXISTS \"${PROJECT_SOURCE_DIR}/lsr-tests\";WITH_LSR_BINDINGS" OFF)
option (WITH_HI_PREC_CLOCK "Enable high-precision time-base." ON)
option (WITH_FLOAT_STD_PREC_CLOCK
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c8c17c9..acf6d4e 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -6,16 +6,16 @@ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PROJECT_CXX_FLAGS}")
link_libraries (${PROJECT_NAME} ${LIBM_LIBRARIES})
if (${BUILD_EXAMPLES} OR ${BUILD_TESTS})
- set (SOURCES 3-options-input-fn)
+ set (SOURCES 3-options-input-fn.c)
if (${WITH_LSR_BINDINGS})
- set (LSR_SOURCES 1a-lsr)
+ set (LSR_SOURCES 1a-lsr.c)
endif ()
endif ()
if (${BUILD_EXAMPLES})
- list (APPEND SOURCES 1-single-block 2-stream 4-split-channels)
+ list (APPEND SOURCES 1-single-block.c 2-stream.C 4-split-channels.c)
if (${WITH_VR32})
- list (APPEND SOURCES 5-variable-rate)
+ list (APPEND SOURCES 5-variable-rate.c)
endif ()
endif ()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb01a0d..24ecd5d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,40 +24,40 @@ add_definitions (${PROJECT_C_FLAGS} -DSOXR_LIB)
# Libsoxr configuration:
-set (RDFT32 fft4g32)
+set (RDFT32 fft4g32.c)
if (AVCODEC_FOUND)
- set (RDFT32 avfft32)
- set (RDFT32S avfft32s)
+ set (RDFT32 avfft32.c)
+ set (RDFT32S avfft32s.c)
elseif (WITH_PFFFT)
- #set (RDFT32 pffft32)
- set (RDFT32S pffft32s)
+ #set (RDFT32 pffft32.c)
+ set (RDFT32S pffft32s.c)
elseif (WITH_CR32S)
- set (RDFT32S fft4g32s)
+ set (RDFT32S fft4g32s.c)
if (NOT WITH_CR32)
- list (APPEND RDFT32S fft4g32)
+ list (APPEND RDFT32S fft4g32.c)
endif ()
endif ()
-set (SOURCES ${PROJECT_NAME}.c data-io)
+set (SOURCES ${PROJECT_NAME}.c data-io.c)
if (WITH_CR32 OR WITH_CR32S OR WITH_CR64 OR WITH_CR64S)
- list (APPEND SOURCES dbesi0 filter fft4g64 cr)
+ list (APPEND SOURCES dbesi0.c filter.c fft4g64.c cr.c)
endif ()
if (WITH_CR32)
- list (APPEND SOURCES cr32 ${RDFT32})
+ list (APPEND SOURCES cr32.c ${RDFT32})
endif ()
if (WITH_CR64)
- list (APPEND SOURCES cr64)
+ list (APPEND SOURCES cr64.c)
endif ()
if (WITH_VR32)
- list (APPEND SOURCES vr32)
+ list (APPEND SOURCES vr32.c)
endif ()
if (WITH_CR32S)
- foreach (source cr32s ${RDFT32S} util32s)
+ foreach (source cr32s.c ${RDFT32S} util32s.c)
list (APPEND SOURCES ${source})
set_property (SOURCE ${source}
APPEND_STRING PROPERTY COMPILE_FLAGS ${SIMD32_C_FLAGS})
@@ -65,7 +65,7 @@ if (WITH_CR32S)
endif ()
if (WITH_CR64S)
- foreach (source cr64s pffft64s util64s)
+ foreach (source cr64s.c pffft64s.c util64s.c)
list (APPEND SOURCES ${source})
set_property (SOURCE ${source}
APPEND_STRING PROPERTY COMPILE_FLAGS ${SIMD64_C_FLAGS})
@@ -100,7 +100,7 @@ if (WITH_LSR_BINDINGS)
set (LSR ${PROJECT_NAME}-lsr)
set (LSR_SO_VERSION 0.1.9)
set (LSR_SO_VERSION_MAJOR 0)
- add_library (${LSR} ${LIB_TYPE} ${LSR})
+ add_library (${LSR} ${LIB_TYPE} ${LSR}.c)
target_link_libraries (${LSR} ${PROJECT_NAME})
set_target_properties (${LSR} PROPERTIES
VERSION "${LSR_SO_VERSION}"
--
2.52.0
|
