diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-11-25 19:41:25 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-11-28 21:20:06 +0300 |
commit | bbd5f30ad62cbd9d308fb6861ca782ac7f2f72bc (patch) | |
tree | 8efa460627b4209a225fdfc8ed232d510fbbd064 /build_files/cmake/config/blender_lite.cmake | |
parent | 9325e5d593ecdfc69ef6d4e129f2fbcae633af43 (diff) |
Build: change CMake option defaults to match "make full"
Previously some important features like OpenSubdiv were disabled by default,
which caused confusion.
The purpose of disabling some of these features was to avoid potentiall build
errors on Linux. But with precompiled libraries, install_deps.sh and better
library availability checking this is hopefully not much of a problem anymore.
This makes "make full" obsolete, but it's kept to not break docs or shell
scripts that people may have, and the .cmake config file remains useful to
modify an existing build folder.
This also changes some option to only be available on platforms where they
are actually supported (WITH_JACK, WITH_TBB_MALLOC_PROXY and X11 options).
Fixes T69742
Differential Revision: https://developer.blender.org/D6306
Diffstat (limited to 'build_files/cmake/config/blender_lite.cmake')
-rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 2a1f4a59c15..3a67836d253 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -24,7 +24,6 @@ set(WITH_LIBMV OFF CACHE BOOL "" FORCE) set(WITH_LLVM OFF CACHE BOOL "" FORCE) set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE) -set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE) set(WITH_IK_SOLVER OFF CACHE BOOL "" FORCE) set(WITH_IK_ITASC OFF CACHE BOOL "" FORCE) set(WITH_IMAGE_CINEON OFF CACHE BOOL "" FORCE) @@ -54,5 +53,9 @@ set(WITH_OPENVDB OFF CACHE BOOL "" FORCE) set(WITH_QUADRIFLOW OFF CACHE BOOL "" FORCE) set(WITH_SDL OFF CACHE BOOL "" FORCE) set(WITH_TBB OFF CACHE BOOL "" FORCE) -set(WITH_X11_XINPUT OFF CACHE BOOL "" FORCE) -set(WITH_X11_XF86VMODE OFF CACHE BOOL "" FORCE) + +if(UNIX AND NOT APPLE) + set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE) + set(WITH_X11_XINPUT OFF CACHE BOOL "" FORCE) + set(WITH_X11_XF86VMODE OFF CACHE BOOL "" FORCE) +endif() |