diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-31 14:00:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-31 14:00:19 +0300 |
| commit | 3f2090f401f2e0c63fc25a4be72d342a564cff2e (patch) | |
| tree | 7e25dbc75256ab77824b4607398950af8e54c530 /build_files | |
| parent | f18de82cd41ad04c29ee711e7b80b13b67505493 (diff) | |
| parent | 671c54f692f632b29dd56d444dc4bc369c92de59 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 2 | ||||
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_release.cmake | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 71811fd23e2..a0ebc641ad6 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 ce4d0c8de66..61ce11bbe0c 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_cuda_config_file = None # Set build options. diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 08272cef9f6..91883771136 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) |