[Bf-blender-cvs] [2aa938b0ae7] master: Cleanup: simplify Linux buildbot config, where default values already match
Brecht Van Lommel
noreply at git.blender.org
Thu Apr 2 17:09:32 CEST 2020
Commit: 2aa938b0ae77f4287a3c7f43b823cc648138c4ce
Author: Brecht Van Lommel
Date: Thu Apr 2 16:32:06 2020 +0200
Branches: master
https://developer.blender.org/rB2aa938b0ae77f4287a3c7f43b823cc648138c4ce
Cleanup: simplify Linux buildbot config, where default values already match
Ref D7309
===================================================================
M build_files/buildbot/config/blender_linux.cmake
===================================================================
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index c970ae4c9c1..2db95c85fc2 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -7,9 +7,6 @@ message(STATUS "Building in CentOS 7 64bit environment")
set(LIBDIR_NAME "linux_centos7_x86_64")
set(WITH_CXX11_ABI OFF CACHE BOOL "" FORCE)
-# Default to only build Blender
-set(WITH_BLENDER ON CACHE BOOL "" FORCE)
-
# ######## Linux-specific build options ########
# Options which are specific to Linux-only platforms
@@ -20,12 +17,6 @@ set(WITH_DOC_MANPAGE OFF CACHE BOOL "" FORCE)
set(WITH_JACK_DYNLOAD ON CACHE BOOL "" FORCE)
set(WITH_SDL_DYNLOAD ON CACHE BOOL "" FORCE)
-set(WITH_SYSTEM_GLEW OFF CACHE BOOL "" FORCE)
-
-set(WITH_OPENMP_STATIC ON CACHE BOOL "" FORCE)
-
-set(WITH_PYTHON_INSTALL_NUMPY ON CACHE BOOL "" FORCE)
-set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE)
# ######## Release environment specific settings ########
@@ -33,8 +24,6 @@ set(LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../lib/${LIBDIR_NAME}" CACHE STRI
# Platform specific configuration, to ensure static linking against everything.
-set(Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE)
-
# We need to link OpenCOLLADA against PCRE library. Even though it is not installed
# on /usr, we do not really care -- all we care is PCRE_FOUND be TRUE and its
# library pointing to a valid one.
More information about the Bf-blender-cvs
mailing list