kfr

commit 6d18d2de454e0973652b64100415bff783768fa5
parent 2941be15c401e4099a41d6ef7a8f2f8295a7c756
Author: [email protected] <[email protected]>
Date:   Mon, 19 Nov 2018 06:41:57 +0000

Ability to include kfr using add_subdirectory

Diffstat:
M
CMakeLists.txt
 | 
7
+++++++
M
tests/CMakeLists.txt
 | 
45
++++++++++++++++++++++++++++++---------------

2 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,6 +37,13 @@ endif()
 # Include list of source files
 include(sources.cmake)
 
+add_library(kfr INTERFACE)
+target_sources(kfr INTERFACE ${KFR_SRC})
+target_include_directories(kfr INTERFACE include)
+
+add_library(kfr_dft include/kfr/dft/dft-src.cpp)
+target_link_libraries(kfr_dft kfr)
+
 add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
 
 option(ENABLE_TESTS "Enable tests and examples. This changes many compiler flags" OFF)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -19,20 +19,19 @@ cmake_minimum_required(VERSION 3.0)
 
 add_definitions(-DKFR_TESTING=1)
 
-include_directories(../include)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/tests/cmake/")
 
 if (NOT ARM)
     if(MSVC AND NOT CLANG)
-        add_executable(multiarch multiarch.cpp multiarch_fir_sse2.cpp multiarch_fir_avx.cpp ${KFR_SRC})
+        add_executable(multiarch multiarch.cpp multiarch_fir_sse2.cpp multiarch_fir_avx.cpp)
         set_source_files_properties(multiarch_fir_sse2.cpp PROPERTIES COMPILE_FLAGS /arch:SSE2)
         set_source_files_properties(multiarch_fir_avx.cpp PROPERTIES COMPILE_FLAGS /arch:AVX)
     else()
-        add_executable(multiarch multiarch.cpp multiarch_fir_sse2.cpp multiarch_fir_avx.cpp ${KFR_SRC})
+        add_executable(multiarch multiarch.cpp multiarch_fir_sse2.cpp multiarch_fir_avx.cpp)
         set_source_files_properties(multiarch_fir_sse2.cpp PROPERTIES COMPILE_FLAGS "-mno-avx -mno-sse3 -msse2")
         set_source_files_properties(multiarch_fir_avx.cpp PROPERTIES COMPILE_FLAGS "-mavx -mno-avx2")
     endif()
+    target_link_libraries(multiarch kfr)
 endif ()
 
 find_package(MPFR)
@@ -53,24 +52,30 @@ else ()
     message(STATUS "MPFR is not found. Skipping transcendental_test")
 endif ()
 
-add_executable(all_tests ${ALL_TESTS_CPP} ${KFR_SRC}  ../include/kfr/dft/dft-src.cpp)
+add_executable(all_tests ${ALL_TESTS_CPP}  ../include/kfr/dft/dft-src.cpp)
 target_compile_definitions(all_tests PRIVATE KFR_NO_MAIN)
+target_link_libraries(all_tests kfr)
+
+add_executable(intrinsic_test intrinsic_test.cpp)
+target_link_libraries(intrinsic_test kfr)
+add_executable(dft_test dft_test.cpp ../include/kfr/dft/dft-src.cpp)
+target_link_libraries(dft_test kfr)
 
-add_executable(intrinsic_test intrinsic_test.cpp ${KFR_SRC} )
-add_executable(dft_test dft_test.cpp ${KFR_SRC}  ../include/kfr/dft/dft-src.cpp)
 if (MPFR_FOUND AND GMP_FOUND)
     add_definitions(-DHAVE_MPFR)
     include_directories(${MPFR_INCLUDE_DIR} ${GMP_INCLUDE_DIR})
-    add_executable(transcendental_test transcendental_test.cpp ${KFR_SRC} )
+    add_executable(transcendental_test transcendental_test.cpp)
     target_link_libraries(all_tests ${MPFR_LIBRARIES} ${GMP_LIBRARIES})
     target_link_libraries(transcendental_test ${MPFR_LIBRARIES} ${GMP_LIBRARIES})
+    target_link_libraries(transcendental_test kfr)
 endif ()
 
 function(add_x86_test NAME FLAGS)
     separate_arguments(FLAGS)
-    add_executable(all_tests_${NAME} ${ALL_TESTS_CPP} ${KFR_SRC}  ../include/kfr/dft/dft-src.cpp)
+    add_executable(all_tests_${NAME} ${ALL_TESTS_CPP}  ../include/kfr/dft/dft-src.cpp)
     target_compile_options(all_tests_${NAME} PRIVATE ${FLAGS})
     target_compile_definitions(all_tests_${NAME} PRIVATE KFR_NO_MAIN)
+    target_link_libraries(all_tests_${NAME} kfr)
     if (MPFR_FOUND AND GMP_FOUND)
         target_link_libraries(all_tests_${NAME} ${MPFR_LIBRARIES} ${GMP_LIBRARIES})
     endif ()
@@ -88,13 +93,23 @@ if (ARCH_TESTS)
     add_x86_test(avx512 "${ARCH_RESET} -msse4.1 -mavx2 -mfma -mavx512f -mavx512cd -mavx512bw -mavx512dq -mavx512vl")
 endif()
 
-add_executable(dsp_test dsp_test.cpp ${KFR_SRC} )
-add_executable(empty_test empty_test.cpp ${KFR_SRC} )
-add_executable(complex_test complex_test.cpp ${KFR_SRC} )
-add_executable(base_test base_test.cpp ${KFR_SRC} )
-add_executable(expression_test expression_test.cpp ${KFR_SRC} )
+add_executable(dsp_test dsp_test.cpp)
+target_link_libraries(dsp_test kfr)
+
+add_executable(empty_test empty_test.cpp)
+target_link_libraries(empty_test kfr)
+
+add_executable(complex_test complex_test.cpp)
+target_link_libraries(complex_test kfr)
+
+add_executable(base_test base_test.cpp)
+target_link_libraries(base_test kfr)
+
+add_executable(expression_test expression_test.cpp)
+target_link_libraries(expression_test kfr)
 
-add_executable(ebu_test ebu_test.cpp ${KFR_SRC} )
+add_executable(ebu_test ebu_test.cpp)
+target_link_libraries(ebu_test kfr)
 
 if(USE_SDE)
     find_program(EMULATOR "sde")