[Bf-blender-cvs] [671c54f692f] master: Fix T56618: crash in release builds when GHOST asserts.
Brecht Van Lommel
noreply at git.blender.org
Fri Aug 31 12:59:31 CEST 2018
Commit: 671c54f692f632b29dd56d444dc4bc369c92de59
Author: Brecht Van Lommel
Date: Fri Aug 31 12:32:12 2018 +0200
Branches: master
https://developer.blender.org/rB671c54f692f632b29dd56d444dc4bc369c92de59
Fix T56618: crash in release builds when GHOST asserts.
WITH_ASSERT_ABORT was not disabled for release builds. In most cases asserts
are disabled in release builds, but not always.
This also changes the buildbot to use blender_release.cmake instead of
blender_full.cmake, the only effective difference should be WITH_ASSERT_ABORT.
===================================================================
M build_files/buildbot/config/blender_linux.cmake
M build_files/buildbot/slave_compile.py
M build_files/cmake/config/blender_release.cmake
===================================================================
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index fa9ecaa60fa..b4d1387a5c8 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -1,6 +1,6 @@
# ######## Global feature set settings ########
-include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")
# Detect which libc we'll be linking against.
# Some of the paths will depend on this
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 6465f2e634d..d5ec5630e39 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -59,7 +59,7 @@ if 'cmake' in builder:
bits = 64
# Config file to be used (relative to blender's sources root)
- cmake_config_file = "build_files/cmake/config/blender_full.cmake"
+ cmake_config_file = "build_files/cmake/config/blender_release.cmake"
cmake_player_config_file = None
cmake_cuda_config_file = None
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index 26267fd314a..121a82f8059 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -5,6 +5,7 @@
#
set(WITH_ALEMBIC ON CACHE BOOL "" FORCE)
+set(WITH_ASSERT_ABORT OFF CACHE BOOL "" FORCE)
set(WITH_BUILDINFO ON CACHE BOOL "" FORCE)
set(WITH_BULLET ON CACHE BOOL "" FORCE)
set(WITH_CODEC_AVI ON CACHE BOOL "" FORCE)
More information about the Bf-blender-cvs
mailing list