[ci] Try to improve whole-archive cmake compat

ossia · Nov 14, 2024 · 131bbd1 · 131bbd1
1 parent 8989a3f
commit 131bbd1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/3rdparty/libossia b/3rdparty/libossia
diff --git a/src/plugins/score-plugin-analysis/CMakeLists.txt b/src/plugins/score-plugin-analysis/CMakeLists.txt
@@ -52,11 +52,8 @@ target_compile_definitions(score_plugin_analysis PRIVATE USE_OSSIA_FFT=1)
 target_include_directories(score_plugin_analysis PRIVATE "${3RDPARTY_FOLDER}/Gist/src")
 target_link_libraries(score_plugin_analysis PUBLIC score_plugin_engine score_plugin_avnd)
 if(TARGET kfr)
-  target_link_libraries(score_plugin_analysis
-      PUBLIC
-        "$<BUILD_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,kfr>>"
-        "$<BUILD_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,kfr_dsp>>"
-    )
+  link_whole_archive(score_plugin_analysis PRIVATE kfr)
+  link_whole_archive(score_plugin_analysis PRIVATE kfr_dsp)
   list(APPEND SCORE_FEATURES_LIST analysis_kfr)
 endif()
 setup_score_plugin(score_plugin_analysis)

diff --git a/src/plugins/score-plugin-avnd/CMakeLists.txt b/src/plugins/score-plugin-avnd/CMakeLists.txt
@@ -92,9 +92,9 @@ target_link_libraries(avnd_halp_module PRIVATE
 if(TARGET kfr_dft)
   target_link_libraries(avnd_halp_module PRIVATE
     "$<BUILD_INTERFACE:kfr>"
-    "$<BUILD_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,kfr_dft>>"
-    "$<BUILD_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,kfr_dsp>>"
   )
+  link_whole_archive(avnd_halp_module PRIVATE kfr_dft)
+  link_whole_archive(avnd_halp_module PRIVATE kfr_dsp)
 endif()
 if(TARGET score_plugin_gfx)
   target_link_libraries(avnd_halp_module PUBLIC score_plugin_gfx)
@@ -330,9 +330,9 @@ target_link_libraries(score_plugin_avnd
 if(TARGET kfr_dft)
   target_link_libraries(score_plugin_avnd PRIVATE
     "$<BUILD_INTERFACE:kfr>"
-    "$<BUILD_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,kfr_dft>>"
-    "$<BUILD_INTERFACE:$<LINK_LIBRARY:WHOLE_ARCHIVE,kfr_dsp>>"
   )
+  link_whole_archive(score_plugin_avnd PRIVATE kfr_dft)
+  link_whole_archive(score_plugin_avnd PRIVATE kfr_dsp)
 endif()
 if(TARGET score_plugin_gfx)
   target_link_libraries(score_plugin_avnd PUBLIC score_plugin_gfx)