[kfr] try to improve cmake logic

ossia · May 20, 2024 · 2e0b4db · 2e0b4db
1 parent 3832c4e
commit 2e0b4db
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/cmake/OssiaDeps.cmake b/cmake/OssiaDeps.cmake
@@ -207,16 +207,17 @@ if(OSSIA_ENABLE_FFT)
       set(OSSIA_ENABLE_FFTW FALSE CACHE INTERNAL "" FORCE)
     endif()
 
-  elseif(OSSIA_ENABLE_KFR)
-    include(deps/kfr)
-
-    if(NOT TARGET kfr)
-      set(OSSIA_ENABLE_KFR FALSE CACHE INTERNAL "" FORCE)
-    endif()
   endif()
+endif()
 
-  if(NOT OSSIA_ENABLE_FFTW AND NOT TARGET kfr_dft)
-    set(OSSIA_FFT NAIVE CACHE INTERNAL "")
-    set(OSSIA_FFT_NAIVE 1 CACHE INTERNAL "")
-  endif()
+if(OSSIA_ENABLE_FFT OR OSSIA_PROTOCOL_AUDIO OR OSSIA_DATAFLOW)
+   include(deps/kfr)
+   if(NOT TARGET kfr)
+     set(OSSIA_ENABLE_KFR FALSE CACHE INTERNAL "" FORCE)
+   endif()
+endif()
+
+if(NOT OSSIA_ENABLE_FFTW AND NOT TARGET kfr_dft)
+  set(OSSIA_FFT NAIVE CACHE INTERNAL "")
+  set(OSSIA_FFT_NAIVE 1 CACHE INTERNAL "")
 endif()
diff --git a/cmake/deps/kfr.cmake b/cmake/deps/kfr.cmake
@@ -16,7 +16,9 @@ endif()
 if(NOT TARGET kfr)
   add_subdirectory("${OSSIA_3RDPARTY_FOLDER}/kfr" "${CMAKE_CURRENT_BINARY_DIR}/kfr_build")
   set_target_properties(kfr PROPERTIES UNITY_BUILD 0)
-  set_target_properties(kfr_dft PROPERTIES UNITY_BUILD 0)
+  if(TARGET kfr_dft)
+    set_target_properties(kfr_dft PROPERTIES UNITY_BUILD 0)
+  endif()
 endif()
 
 if(KFR_ENABLE_DFT)