this repo has no description
Merge pull request #57 from basilgello/debian-fixes
Modernize upstream package after inclusion to Debian
authored by
mborgerding
and committed by
GitHub
d11f1a88
cc862cb0
+52
-23
+19
-6
CMakeLists.txt
+19
-6
CMakeLists.txt
···
11
11
option(KISSFFT_SIMD "Build kissfft with SIMD" OFF)
12
12
option(KISSFFT_FLOAT "Build kissfft with float type" ON)
13
13
option(KISSFFT_OPENMP "Build kissfft with openmp" OFF)
14
+
option(KISSFFT_TOOLS "Build kissfft tools" ON)
15
+
option(KISSFFT_TEST "Build and enable kissfft tests" ON)
16
+
option(KISSFFT_INSTALL "Enable kissfft install" ON)
17
+
18
+
if (KISSFFT_INSTALL)
19
+
include(GNUInstallDirs)
20
+
endif()
14
21
15
22
if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
16
23
add_compile_options(-ffast-math -fomit-frame-pointer
···
33
40
endif()
34
41
35
42
add_library(kissfft
36
-
kiss_fft.c)
43
+
kiss_fft.c
44
+
tools/kfc.c
45
+
tools/kiss_fftnd.c
46
+
tools/kiss_fftndr.c
47
+
tools/kiss_fftr.c)
37
48
38
49
target_include_directories(kissfft PUBLIC
39
50
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
···
93
104
OUTPUT_NAME "${NAME}_${KISSFFT_DATATYPE}")
94
105
endfunction()
95
106
96
-
option(KISSFFT_TOOLS "Build kissfft tools" ON)
97
107
if(KISSFFT_TOOLS)
98
108
add_subdirectory(tools)
99
109
endif()
100
110
101
-
option(KISSFFT_TEST "Build and enable kissfft tests" ON)
102
111
if(KISSFFT_TEST)
103
112
enable_testing()
104
113
add_subdirectory(test)
105
114
endif()
106
115
107
-
option(KISSFFT_INSTALL "Enable kissfft install" ON)
108
116
if (KISSFFT_INSTALL)
109
-
include(GNUInstallDirs)
110
117
install(TARGETS kissfft EXPORT kissfft
111
118
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
112
119
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
113
120
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
114
-
install(FILES "kiss_fft.h" "kissfft.hh" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
121
+
install(FILES kiss_fft.h
122
+
kissfft.hh
123
+
tools/kfc.h
124
+
tools/kiss_fftnd.h
125
+
tools/kiss_fftndr.h
126
+
tools/kiss_fftr.h
127
+
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
115
128
116
129
set(KISSFFT_INSTALL_CMAKE "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE FILEPATH "Install destination of kissfft cmake modules")
117
130
mark_as_advanced(KISSFFT_INSTALL_CMAKE)
+3
-3
test/CMakeLists.txt
+3
-3
test/CMakeLists.txt
···
12
12
add_kissfft_executable(${NAME} ${ARGN} $<TARGET_OBJECTS:kissfft_help_library>)
13
13
target_include_directories(${NAME} PRIVATE ../tools)
14
14
add_test(NAME ${NAME} COMMAND ${NAME})
15
-
set_tests_properties(${NAME} PROPERTIES TIMEOUT 10)
15
+
set_tests_properties(${NAME} PROPERTIES TIMEOUT 3600)
16
16
endfunction()
17
17
18
18
set(KISSFFT_TEST_NUMFFTS 10000)
19
19
20
20
add_kissfft_test_executable(bm_kiss benchkiss.c)
21
21
# add_test(NAME benchmar COMMAND ${NAME})
22
-
# set_tests_properties(${NAME} PROPERTIES TIMEOUT 10)
22
+
# set_tests_properties(${NAME} PROPERTIES TIMEOUT 3600)
23
23
24
24
include(FindPkgConfig)
25
25
if(KISSFFT_FLOAT)
···
44
44
find_package(PythonInterp REQUIRED)
45
45
add_test(NAME testkiss.py COMMAND "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/testkiss.py")
46
46
set_tests_properties(testkiss.py PROPERTIES
47
-
TIMEOUT 20
47
+
TIMEOUT 3600
48
48
ENVIRONMENT "DATATYPE=${KISSFFT_DATATYPE}"
49
49
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+19
-3
tools/CMakeLists.txt
+19
-3
tools/CMakeLists.txt
···
1
-
add_kissfft_executable(fastconvr kiss_fastfir.c kiss_fftr.c)
1
+
add_kissfft_executable(fastconvr kiss_fastfir.c)
2
2
target_compile_definitions(fastconvr PRIVATE REAL_FASTFIR FAST_FILT_UTIL)
3
3
4
4
add_kissfft_executable(fastconv kiss_fastfir.c)
5
5
target_compile_definitions(fastconv PRIVATE FAST_FILT_UTIL)
6
6
7
-
add_kissfft_executable(fft fftutil.c kiss_fftnd.c kiss_fftr.c kiss_fftndr.c)
7
+
add_kissfft_executable(fft fftutil.c)
8
+
9
+
10
+
if (KISSFFT_INSTALL)
11
+
install(TARGETS fastconv fastconvr fft
12
+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
13
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
14
+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
15
+
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
16
+
endif()
8
17
9
18
# psdpng does not build with "simd" datatype
10
19
if(NOT KISSFFT_DATATYPE MATCHES "simd")
11
20
include(FindPkgConfig)
12
21
pkg_check_modules(libpng REQUIRED IMPORTED_TARGET libpng)
13
-
add_kissfft_executable(psdpng psdpng.c kiss_fftr.c)
22
+
add_kissfft_executable(psdpng psdpng.c)
14
23
target_link_libraries(psdpng PRIVATE PkgConfig::libpng)
24
+
if (KISSFFT_INSTALL)
25
+
install(TARGETS psdpng
26
+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
27
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
28
+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
29
+
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
30
+
endif()
15
31
endif()
16
32
17
33
#FIXME: dumphdr.c is not available
+3
-3
tools/kfc.h
+3
-3
tools/kfc.h
···
40
40
*/
41
41
42
42
/*forward complex FFT */
43
-
void kfc_fft(int nfft, const kiss_fft_cpx * fin,kiss_fft_cpx * fout);
43
+
void KISS_FFT_API kfc_fft(int nfft, const kiss_fft_cpx * fin,kiss_fft_cpx * fout);
44
44
/*reverse complex FFT */
45
-
void kfc_ifft(int nfft, const kiss_fft_cpx * fin,kiss_fft_cpx * fout);
45
+
void KISS_FFT_API kfc_ifft(int nfft, const kiss_fft_cpx * fin,kiss_fft_cpx * fout);
46
46
47
47
/*free all cached objects*/
48
-
void kfc_cleanup(void);
48
+
void KISS_FFT_API kfc_cleanup(void);
49
49
50
50
#ifdef __cplusplus
51
51
}
+2
-2
tools/kiss_fftnd.h
+2
-2
tools/kiss_fftnd.h
···
17
17
18
18
typedef struct kiss_fftnd_state * kiss_fftnd_cfg;
19
19
20
-
kiss_fftnd_cfg kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem);
21
-
void kiss_fftnd(kiss_fftnd_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
20
+
kiss_fftnd_cfg KISS_FFT_API kiss_fftnd_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem);
21
+
void KISS_FFT_API kiss_fftnd(kiss_fftnd_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
22
22
23
23
#ifdef __cplusplus
24
24
}
+3
-3
tools/kiss_fftndr.h
+3
-3
tools/kiss_fftndr.h
···
20
20
typedef struct kiss_fftndr_state *kiss_fftndr_cfg;
21
21
22
22
23
-
kiss_fftndr_cfg kiss_fftndr_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem);
23
+
kiss_fftndr_cfg KISS_FFT_API kiss_fftndr_alloc(const int *dims,int ndims,int inverse_fft,void*mem,size_t*lenmem);
24
24
/*
25
25
dims[0] must be even
26
26
···
28
28
*/
29
29
30
30
31
-
void kiss_fftndr(
31
+
void KISS_FFT_API kiss_fftndr(
32
32
kiss_fftndr_cfg cfg,
33
33
const kiss_fft_scalar *timedata,
34
34
kiss_fft_cpx *freqdata);
···
37
37
output freqdata has dims[0] X dims[1] X ... X dims[ndims-1]/2+1 complex points
38
38
*/
39
39
40
-
void kiss_fftndri(
40
+
void KISS_FFT_API kiss_fftndri(
41
41
kiss_fftndr_cfg cfg,
42
42
const kiss_fft_cpx *freqdata,
43
43
kiss_fft_scalar *timedata);
+3
-3
tools/kiss_fftr.h
+3
-3
tools/kiss_fftr.h
···
26
26
typedef struct kiss_fftr_state *kiss_fftr_cfg;
27
27
28
28
29
-
kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenmem);
29
+
kiss_fftr_cfg KISS_FFT_API kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenmem);
30
30
/*
31
31
nfft must be even
32
32
···
34
34
*/
35
35
36
36
37
-
void kiss_fftr(kiss_fftr_cfg cfg,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata);
37
+
void KISS_FFT_API kiss_fftr(kiss_fftr_cfg cfg,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata);
38
38
/*
39
39
input timedata has nfft scalar points
40
40
output freqdata has nfft/2+1 complex points
41
41
*/
42
42
43
-
void kiss_fftri(kiss_fftr_cfg cfg,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata);
43
+
void KISS_FFT_API kiss_fftri(kiss_fftr_cfg cfg,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata);
44
44
/*
45
45
input freqdata has nfft/2+1 complex points
46
46
output timedata has nfft scalar points