From 5e4bfee831d4e518c5ad90abade1734ce1605109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Fri, 18 Aug 2017 17:12:10 +0200 Subject: [PATCH 1/3] fixup! Rename double_t to ffts_double_t, and use for all trig tables --- src/ffts_trig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ffts_trig.c b/src/ffts_trig.c index 1094be4d8f7..6c1b9447722 100644 --- a/src/ffts_trig.c +++ b/src/ffts_trig.c @@ -881,7 +881,7 @@ int ffts_generate_cosine_sine_pow2_32f(ffts_cpx_32f *const table, int table_size) { const ffts_cpx_64f *FFTS_RESTRICT ct; - const double_t *FFTS_RESTRICT hs; + const ffts_double_t *FFTS_RESTRICT hs; ffts_cpx_64f FFTS_ALIGN(16) w[32]; int i, log_2, offset; From fb229c9ef406b75ca533655bc8ec9d376116e78e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Fri, 18 Aug 2017 17:13:04 +0200 Subject: [PATCH 2/3] Fixup pkgconfig file generated by CMake --- CMakeLists.txt | 2 +- ffts.pc.cmake.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a02f11a13c7..5216a4e7393 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(FFTS_MAJOR 0) set(FFTS_MINOR 9) set(FFTS_MICRO 0) -set(FFTS_VERSION "ffts-${FFTS_MAJOR}.${FFTS_MINOR}.${FFTS_MICRO}") +set(FFTS_VERSION "${FFTS_MAJOR}.${FFTS_MINOR}.${FFTS_MICRO}") set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/ffts.pc.cmake.in b/ffts.pc.cmake.in index 43f38e9c114..63d4cc08a89 100644 --- a/ffts.pc.cmake.in +++ b/ffts.pc.cmake.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${exec_prefix} -libdir=${libdir} -includedir=${includedir} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include Name: @CMAKE_PROJECT_NAME@ Description: fast Fourier transform library From b34dd8abf126a9b4c000b28b3025a614b00cfdfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Fri, 18 Aug 2017 17:13:42 +0200 Subject: [PATCH 3/3] Text files MUST end with a \n --- src/ffts_trig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ffts_trig.c b/src/ffts_trig.c index 6c1b9447722..cd59d9f82f3 100644 --- a/src/ffts_trig.c +++ b/src/ffts_trig.c @@ -1136,4 +1136,4 @@ ffts_generate_table_1d_real_32f(struct _ffts_plan_t *const p, } return 0; -} \ No newline at end of file +}