Fix T56618: crash in release builds when GHOST asserts.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Aug 2018 10:32:12 +0000 (12:32 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 31 Aug 2018 10:43:39 +0000 (12:43 +0200)
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.

build_files/buildbot/config/blender_linux.cmake
build_files/buildbot/slave_compile.py
build_files/cmake/config/blender_release.cmake

index fa9ecaa60fa3e7b8e3a874a72e6ba71adb1b37ba..b4d1387a5c8c7fd6a68f3a101cd9d4a6852dc48f 100644 (file)
@@ -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
index 6465f2e634d18b461f2aeb2e3591f41e3c9ffd10..d5ec5630e39ec4aa5c4759f2341e3b7a7e0a16c4 100644 (file)
@@ -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
 
index 26267fd314ae7c8c00c6d817b1c18cf5e09efc67..121a82f8059aa88f9d475bc53449637e0bd01783 100644 (file)
@@ -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)