Refactor KFR modules

Author: dancasarin

CMakeLists.txt

@@ -217,9 +217,11 @@ if (CLANG)
 else ()
     option(KFR_ENABLE_DFT "Enable DFT and related algorithms." OFF)
 endif ()
-option(KFR_ENABLE_ASMTEST "Enable writing disassembly" OFF)
 option(KFR_ENABLE_AUDIO "Enable Audio classes" ON)
 option(KFR_ENABLE_IO "Enable IO classes" ON)
+option(KFR_ENABLE_DSP "Enable DSP module" ON)
+
+option(KFR_ENABLE_ASMTEST "Enable writing disassembly" OFF)
 option(KFR_REGENERATE_TESTS "Regenerate auto tests" OFF)
 option(KFR_DISABLE_CLANG_EXTENSIONS "Disable Clang vector extensions" OFF)
 option(KFR_EXTENDED_TESTS "Extended tests (up to hour)" OFF)
@@ -425,9 +427,24 @@ if (MSVC)
     target_compile_options(kfr INTERFACE $<$<CXX_COMPILER_ID:MSVC>:/Zc:lambda>)
 endif ()
 
-if (NOT KFR_ENABLE_DFT)
+if (KFR_ENABLE_DFT)
+    target_compile_definitions(kfr INTERFACE $<BUILD_INTERFACE:KFR_HAVE_DFT>)
+else ()
     target_compile_definitions(kfr INTERFACE $<BUILD_INTERFACE:KFR_NO_DFT>)
 endif ()
+
+if (KFR_ENABLE_DSP)
+    target_compile_definitions(kfr INTERFACE $<BUILD_INTERFACE:KFR_HAVE_DSP>)
+endif ()
+
+if (KFR_ENABLE_IO)
+    target_compile_definitions(kfr INTERFACE $<BUILD_INTERFACE:KFR_HAVE_IO>)
+endif ()
+
+if (KFR_ENABLE_AUDIO)
+    target_compile_definitions(kfr INTERFACE $<BUILD_INTERFACE:KFR_HAVE_AUDIO>)
+endif ()
+
 if (KFR_EXTENDED_TESTS)
     target_compile_definitions(kfr
                                INTERFACE $<BUILD_INTERFACE:KFR_EXTENDED_TESTS>)
@@ -442,13 +459,23 @@ set(KFR_DEBUG_INSTALL_SUFFIX
     "/debug"
     CACHE STRING "")
 
-add_subdirectory(src/dsp)
-if(KFR_ENABLE_IO)
-  add_subdirectory(src/io)
-  if(KFR_ENABLE_AUDIO)
+if (KFR_ENABLE_AUDIO AND NOT KFR_ENABLE_IO)
+    message(FATAL_ERROR "KFR_ENABLE_AUDIO requires KFR_ENABLE_IO to be enabled")
+endif ()
+if (KFR_ENABLE_AUDIO AND NOT KFR_ENABLE_DSP)
+    message(
+        FATAL_ERROR "KFR_ENABLE_AUDIO requires KFR_ENABLE_DSP to be enabled")
+endif ()
+
+if (KFR_ENABLE_DSP)
+    add_subdirectory(src/dsp)
+endif ()
+if (KFR_ENABLE_IO)
+    add_subdirectory(src/io)
+endif ()
+if (KFR_ENABLE_AUDIO)
     add_subdirectory(src/audio)
-  endif()
-endif()
+endif ()
 if (KFR_ENABLE_DFT)
     add_subdirectory(src/dft)
 endif ()
@@ -481,14 +508,15 @@ if (KFR_ENABLE_DFT)
     append_defines_from(kfr_dft)
 endif ()
 
-append_defines_from(kfr_dsp)
-
-if(KFR_ENABLE_IO)
-  append_defines_from(kfr_io)
-  if(KFR_ENABLE_AUDIO)
+if (KFR_ENABLE_DSP)
+    append_defines_from(kfr_dsp)
+endif ()
+if (KFR_ENABLE_IO)
+    append_defines_from(kfr_io)
+endif ()
+if (KFR_ENABLE_AUDIO)
     append_defines_from(kfr_audio)
-  endif()
-endif()
+endif ()
 
 string(REPLACE "$<BUILD_INTERFACE:" "" kfr_defines "${kfr_defines}")
 string(REPLACE ">" "" kfr_defines "${kfr_defines}")

tests/CMakeLists.txt

@@ -133,6 +133,17 @@ target_link_libraries(all_tests kfr use_arch kfr_dsp)
 if (KFR_ENABLE_DFT)
     target_link_libraries(all_tests kfr_dft)
 endif ()
+
+if (NOT TARGET kfr_dsp)
+    message(FATAL_ERROR "KFR DSP module is not built, cannot build tests")
+endif ()
+if (NOT TARGET kfr_io)
+    message(FATAL_ERROR "KFR IO module is not built, cannot build tests")
+endif ()
+if (NOT TARGET kfr_audio)
+    message(FATAL_ERROR "KFR Audio module is not built, cannot build tests")
+endif ()
+
 target_link_libraries(all_tests kfr_io)
 
 option(KFR_NO_PERF_TESTS "Disable performance tests" OFF)