[Bf-blender-cvs] [f4bc9b7] buildbot_linux_cmake: Cleanup to address feedback from Campbell
Sergey Sharybin
noreply at git.blender.org
Wed Dec 2 12:16:29 CET 2015
Commit: f4bc9b711f21aac78a4f02fc27a517f956e0433f
Author: Sergey Sharybin
Date: Wed Dec 2 16:16:14 2015 +0500
Branches: buildbot_linux_cmake
https://developer.blender.org/rBf4bc9b711f21aac78a4f02fc27a517f956e0433f
Cleanup to address feedback from Campbell
===================================================================
M CMakeLists.txt
M build_files/buildbot/config/blender_linux.cmake
M build_files/buildbot/slave_compile.py
M build_files/buildbot/slave_pack.py
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed8fbcd..8e13b92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2466,6 +2466,10 @@ if(WITH_OPENMP)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
else()
+ # Typically avoid adding flags as defines but we can't
+ # ass OpenMP flags to the linker for static builds, meaning
+ # we can't add any OpenMP related flags to CFLAGS variables
+ # since they're passed to the linker as well.
add_definitions("${OpenMP_C_FLAGS}")
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libgomp.a
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index 1a344cb..046a942 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -1,59 +1,10 @@
# ######## Global feature set settings ########
-#
-# !!!! Keep in sync with blender_full.cmake !!!!
-#
-set(WITH_BUILDINFO ON CACHE BOOL "" FORCE)
-set(WITH_BULLET ON CACHE BOOL "" FORCE)
-set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE)
-set(WITH_CODEC_FFMPEG ON CACHE BOOL "" FORCE)
-set(WITH_CODEC_SNDFILE ON CACHE BOOL "" FORCE)
-set(WITH_CYCLES ON CACHE BOOL "" FORCE)
-set(WITH_CYCLES_OSL 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)
-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)
-set(WITH_IMAGE_DDS ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_FRAMESERVER ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_HDR ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_OPENEXR ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_OPENJPEG ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_REDCODE ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_TIFF ON CACHE BOOL "" FORCE)
-set(WITH_INPUT_NDOF ON CACHE BOOL "" FORCE)
-set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE)
-set(WITH_JACK ON CACHE BOOL "" FORCE)
-set(WITH_LLVM ON CACHE BOOL "" FORCE)
-set(WITH_LZMA ON CACHE BOOL "" FORCE)
-set(WITH_LZO ON CACHE BOOL "" FORCE)
-set(WITH_MOD_BOOLEAN ON CACHE BOOL "" FORCE)
-set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE)
-set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE)
-set(WITH_MOD_SMOKE ON CACHE BOOL "" FORCE)
-set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE)
-set(WITH_AUDASPACE ON CACHE BOOL "" FORCE)
-set(WITH_OPENAL ON CACHE BOOL "" FORCE)
-set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE)
-set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE)
-set(WITH_OPENMP ON CACHE BOOL "" FORCE)
-set(WITH_OPENNL ON CACHE BOOL "" FORCE)
-set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE)
-set(WITH_PLAYER OFF CACHE BOOL "" FORCE)
-set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE)
-set(WITH_RAYOPTIMIZATION ON CACHE BOOL "" FORCE)
-set(WITH_SDL 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)
+
+include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")
# ######## Linux-specific build options ########
# Options which are specific to Linux-only platforms
+set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE)
set(WITH_DOC_MANPAGE OFF CACHE BOOL "" FORCE)
# ######## Official release-specific build options ########
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index f9cdd91..25db927 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -42,9 +42,9 @@ if 'cmake' in builder:
install_dir = os.path.abspath(os.path.join('..', 'install', builder))
targets = ['blender']
- chroot_name = None # If not None command will be deligated to that chroot
+ chroot_name = None # If not None command will be delegated to that chroot
build_cubins = True # Whether to build Cycles CUDA kernels
- remove_cache = False # Remove CMAke cache to be sure config is totally up-to-date
+ remove_cache = False # Remove CMake cache to be sure config is totally up-to-date
remove_install_dir = False # Remove installation folder before building
# Config file to be used (relative to blender's sources root)
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 80004e9..416f614 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -82,8 +82,8 @@ if builder.find('scons') != -1:
blenderplayer = os.path.join(install_dir, 'blenderplayer')
subprocess.call(['schroot', '-c', chroot_name, '--', 'strip', '--strip-all', blender, blenderplayer])
- extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra')
- mesalibs = os.path.join(extra, 'mesalibs' + str(bits) + '.tar.bz2')
+ extra = "/home/sources/release-builder/extra/"
+ mesalibs = os.path.join(extra, 'mesalibs%d.tar.bz2' % bits)
software_gl = os.path.join(extra, 'blender-softwaregl')
os.system('tar -xpf %s -C %s' % (mesalibs, install_dir))
@@ -212,7 +212,7 @@ else:
upload_filepath = install_dir + '.tar.bz2'
-if upload_filepath == None:
+if upload_filepath is None:
# clean release directory if it already exists
release_dir = 'release'
More information about the Bf-blender-cvs
mailing list