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/buildbot/config | |
parent | f18de82cd41ad04c29ee711e7b80b13b67505493 (diff) | |
parent | 671c54f692f632b29dd56d444dc4bc369c92de59 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/buildbot/config')
-rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 2 |
1 files changed, 1 insertions, 1 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 |