griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: cmake WITH_RUBBERBAND option sanitization

Browse Source 
Instead of conditionally defining it only when WITH_AUDASPACE is on
but WITH_SYSTEM_AUDASPACE is off, always define it to ON, and later
on turn it off with set_and_warn_dependency / set_and_warn_incompatible
similar to how all the other options are handled.

Also move it under "Audio" section of cmake configuration print

Pull Request: https://projects.blender.org/blender/blender/pulls/147679
This commit is contained in:
Aras Pranckevicius
2025-10-09 18:35:38 +02:00
committed by Aras Pranckevicius
parent 74fc101024
commit e60c5475ca
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -414,17 +414,17 @@ Build with external audaspace library installed on the system \
(only enable if you know what you're doing!)"
OFF
)
mark_as_advanced(WITH_AUDASPACE)
mark_as_advanced(WITH_SYSTEM_AUDASPACE)
if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
option(WITH_RUBBERBAND "\
Build with Rubber Band for audio time-stretching and pitch-scaling (used by Audaspace)"
ON
)
endif()
mark_as_advanced(WITH_AUDASPACE)
mark_as_advanced(WITH_SYSTEM_AUDASPACE)
mark_as_advanced(WITH_RUBBERBAND)
set_and_warn_dependency(WITH_AUDASPACE WITH_SYSTEM_AUDASPACE OFF)
set_and_warn_dependency(WITH_AUDASPACE WITH_RUBBERBAND OFF)
set_and_warn_incompatible(WITH_SYSTEM_AUDASPACE WITH_RUBBERBAND OFF)
if(WITH_GHOST_X11)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
@@ -2840,7 +2840,6 @@ if(FIRST_RUN)
info_cfg_option(WITH_POTRACE)
info_cfg_option(WITH_PUGIXML)
info_cfg_option(WITH_QUADRIFLOW)
info_cfg_option(WITH_RUBBERBAND)
info_cfg_option(WITH_TBB)
info_cfg_option(WITH_USD)
info_cfg_option(WITH_MATERIALX)
@@ -2879,6 +2878,7 @@ if(FIRST_RUN)
info_cfg_text("Audio:")
info_cfg_option(WITH_AUDASPACE)
info_cfg_option(WITH_RUBBERBAND)
info_cfg_option(WITH_CODEC_FFMPEG)
info_cfg_option(WITH_CODEC_SNDFILE)
info_cfg_option(WITH_COREAUDIO)