[Bf-blender-cvs] [95f698f] master: Adjust CMake platform dependant release options
Campbell Barton
noreply at git.blender.org
Fri Jul 24 11:45:14 CEST 2015
Commit: 95f698f84082ef9e31cd3de08f799de3ba791ed8
Author: Campbell Barton
Date: Fri Jul 24 19:39:12 2015 +1000
Branches: master
https://developer.blender.org/rB95f698f84082ef9e31cd3de08f799de3ba791ed8
Adjust CMake platform dependant release options
===================================================================
M build_files/cmake/config/blender_full.cmake
===================================================================
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index acbc3ac..6410aeb 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -12,6 +12,7 @@ set(WITH_CODEC_SNDFILE ON CACHE BOOL "" FORCE)
set(WITH_CYCLES ON CACHE BOOL "" FORCE)
set(WITH_FFTW3 ON CACHE BOOL "" FORCE)
set(WITH_LIBMV ON CACHE BOOL "" FORCE)
+set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
set(WITH_GAMEENGINE ON CACHE BOOL "" FORCE)
set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE)
set(WITH_FREESTYLE ON CACHE BOOL "" FORCE)
@@ -51,11 +52,15 @@ set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE)
set(WITH_PLAYER ON CACHE BOOL "" FORCE)
set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE)
+
+# platform dependant options
if(UNIX AND NOT APPLE)
+ set(WITH_JACK ON CACHE BOOL "" FORCE)
set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE)
-endif()
-
-if(APPLE)
+elseif(WIN32)
+ set(WITH_JACK OFF CACHE BOOL "" FORCE)
+elseif (APPLE)
+ set(WITH_JACK ON CACHE BOOL "" FORCE)
set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE)
endif()
More information about the Bf-blender-cvs
mailing list