diff options
Diffstat (limited to 'build_files/cmake/config')
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 16 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 9 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_release.cmake | 16 |
3 files changed, 18 insertions, 23 deletions
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 56b970c349d..2511ee02e39 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -18,7 +18,6 @@ set(WITH_LIBMV ON CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE) set(WITH_FREESTYLE ON CACHE BOOL "" FORCE) -set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE) set(WITH_IK_ITASC ON CACHE BOOL "" FORCE) set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE) @@ -49,20 +48,17 @@ set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) set(WITH_QUADRIFLOW ON CACHE BOOL "" FORCE) set(WITH_SDL ON CACHE BOOL "" FORCE) set(WITH_TBB ON CACHE BOOL "" FORCE) -set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) -set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) # platform dependent options -if(UNIX AND NOT APPLE) +if(NOT WIN32) set(WITH_JACK ON CACHE BOOL "" FORCE) +endif() +if(UNIX AND NOT APPLE) set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) -elseif(WIN32) - set(WITH_JACK OFF CACHE BOOL "" FORCE) -elseif(APPLE) - set(WITH_JACK ON CACHE BOOL "" FORCE) - -# include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") + set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) + set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) + set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) endif() 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() diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index af089834295..813dfc493b5 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -19,7 +19,6 @@ set(WITH_LIBMV ON CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE) set(WITH_FREESTYLE ON CACHE BOOL "" FORCE) -set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE) set(WITH_IK_ITASC ON CACHE BOOL "" FORCE) set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE) @@ -50,8 +49,6 @@ set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) set(WITH_QUADRIFLOW ON CACHE BOOL "" FORCE) set(WITH_SDL ON CACHE BOOL "" FORCE) set(WITH_TBB ON CACHE BOOL "" FORCE) -set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) -set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE) @@ -60,13 +57,12 @@ set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm set(WITH_CYCLES_DEVICE_OPTIX ON CACHE BOOL "" FORCE) # platform dependent options -if(UNIX AND NOT APPLE) +if(NOT WIN32) set(WITH_JACK ON CACHE BOOL "" FORCE) +endif() +if(UNIX AND NOT APPLE) set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) -elseif(WIN32) - set(WITH_JACK OFF CACHE BOOL "" FORCE) -elseif(APPLE) - set(WITH_JACK ON CACHE BOOL "" FORCE) - -# include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") + set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) + set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) + set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) endif() |