Commit: 821dee6de42e5586847b993a2f0bd5ffdac508b5 Author: Campbell Barton Date: Wed Jan 25 11:53:50 2023 +1100 Branches: master https://developer.blender.org/rB821dee6de42e5586847b993a2f0bd5ffdac508b5
CMake: de-duplicate option(..) for platform specific defaults Use a variable for the default instead, avoid duplicate descriptions. =================================================================== M CMakeLists.txt =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index df1a5a88550..a631b3e6a60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,14 +167,26 @@ get_blender_version() option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON) mark_as_advanced(WITH_BLENDER) -if(APPLE) - # In future, can be used with `quicklookthumbnailing/qlthumbnailreply` to create file - # thumbnails for say Finder. Turn it off for now. - option(WITH_BLENDER_THUMBNAILER "Build \"blender-thumbnailer\" thumbnail extraction utility" OFF) -elseif(WIN32) - option(WITH_BLENDER_THUMBNAILER "Build \"BlendThumb.dll\" helper for Windows explorer integration" ON) +if(WIN32) + option(WITH_BLENDER_THUMBNAILER "\ +Build \"BlendThumb.dll\" helper for Windows explorer integration to support extracting \ +thumbnails from `.blend` files." + ON + ) else() - option(WITH_BLENDER_THUMBNAILER "Build \"blender-thumbnailer\" thumbnail extraction utility" ON) + set(_option_default ON) + if(APPLE) + # In future, can be used with `quicklookthumbnailing/qlthumbnailreply` + # to create file thumbnails for say Finder. + # Turn it off for now, even though it can build on APPLE, it's not likely to be useful. + set(_option_default OFF) + endif() + option(WITH_BLENDER_THUMBNAILER "\ +Build stand-alone \"blender-thumbnailer\" command-line thumbnail extraction utility, \ +intended for use by file-managers to extract PNG images from `.blend` files." + ${_option_default} + ) + unset(_option_default) endif() option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON) @@ -214,14 +226,19 @@ option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" ) mark_as_advanced(WITH_SYSTEM_BULLET) option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ON) + +set(_option_default ON) if(APPLE) # There's no OpenXR runtime in sight for macOS, neither is code well # tested there -> disable it by default. - option(WITH_XR_OPENXR "Enable VR features through the OpenXR specification" OFF) + set(_option_default OFF) +endif() +option(WITH_XR_OPENXR "Enable VR features through the OpenXR specification" ${_option_default}) +if(APPLE) mark_as_advanced(WITH_XR_OPENXR) -else() - option(WITH_XR_OPENXR "Enable VR features through the OpenXR specification" ON) endif() +unset(_option_default) + option(WITH_GMP "Enable features depending on GMP (Exact Boolean)" ON) # Compositor @@ -353,12 +370,13 @@ else() set(WITH_COREAUDIO OFF) endif() if(NOT WIN32) + set(_option_default ON) if(APPLE) - option(WITH_JACK "Enable JACK Support (http://www.jackaudio.org)" OFF) - else() - option(WITH_JACK "Enable JACK Support (http://www.jackaudio.org)" ON) + set(_option_default OFF) endif() - option(WITH_JACK_DYNLOAD "Enable runtime dynamic JACK libraries loading" OFF) + option(WITH_JACK "Enable JACK Support (http://www.jackaudio.org)" ${_option_default}) + unset(_option_default) + option(WITH_JACK_DYNLOAD "Enable runtime dynamic JACK libraries loading" OFF) else() set(WITH_JACK OFF) endif() _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs