Commit: ab0be1b72084010f853060cce4b39bd8de94dfa4
Author: Pablo Dobarro
Date: Tue Apr 23 17:51:51 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rBab0be1b72084010f853060cce4b39bd8de94dfa4
Merge commit 'e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1' into
sculpt-mode-features
===================================================================
===================================================================
diff --cc CMakeLists.txt
index bc0e0023cfb,2f5b8240c88..ff9a06730e7
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -24,20 -24,20 +24,20 @@@
# build the libs and objects in it.
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-- if(NOT DEFINED WITH_IN_SOURCE_BUILD)
-- message(FATAL_ERROR
-- "CMake generation for blender is not allowed within the
source directory!"
-- "\n Remove \"${CMAKE_SOURCE_DIR}/CMakeCache.txt\" and
try again from another folder, e.g.:"
-- "\n "
-- "\n rm CMakeCache.txt"
-- "\n cd .."
-- "\n mkdir cmake-make"
-- "\n cd cmake-make"
-- "\n cmake ../blender"
-- "\n "
-- "\n Alternately define WITH_IN_SOURCE_BUILD to force
this option (not recommended!)"
-- )
-- endif()
++ if(NOT DEFINED WITH_IN_SOURCE_BUILD)
++ message(FATAL_ERROR
++ "CMake generation for blender is not allowed within the source
directory!"
++ "\n Remove \"${CMAKE_SOURCE_DIR}/CMakeCache.txt\" and try again from
another folder, e.g.:"
++ "\n "
++ "\n rm CMakeCache.txt"
++ "\n cd .."
++ "\n mkdir cmake-make"
++ "\n cd cmake-make"
++ "\n cmake ../blender"
++ "\n "
++ "\n Alternately define WITH_IN_SOURCE_BUILD to force this option (not
recommended!)"
++ )
++ endif()
endif()
cmake_minimum_required(VERSION 3.5)
@@@ -46,13 -46,13 +46,13 @@@
# platforms which don't hare GLVND yet. Only do it if preference was not set
# externally.
if(NOT DEFINED OpenGL_GL_PREFERENCE)
-- set(OpenGL_GL_PREFERENCE "LEGACY")
++ set(OpenGL_GL_PREFERENCE "LEGACY")
endif()
if(NOT EXECUTABLE_OUTPUT_PATH)
-- set(FIRST_RUN TRUE)
++ set(FIRST_RUN TRUE)
else()
-- set(FIRST_RUN FALSE)
++ set(FIRST_RUN FALSE)
endif()
# this starts out unset
@@@ -61,12 -61,12 +61,12 @@@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_
# avoid having empty buildtype
if(NOT DEFINED CMAKE_BUILD_TYPE_INIT)
-- set(CMAKE_BUILD_TYPE_INIT "Release")
++ set(CMAKE_BUILD_TYPE_INIT "Release")
endif()
# Omit superfluous "Up-to-date" messages.
if(NOT DEFINED CMAKE_INSTALL_MESSAGE)
-- set(CMAKE_INSTALL_MESSAGE "LAZY")
++ set(CMAKE_INSTALL_MESSAGE "LAZY")
endif()
# quiet output for Makefiles, 'make -s' helps too
@@@ -74,10 -74,10 +74,10 @@@
# global compile definitions since add_definitions() adds for all.
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
-- $<$<CONFIG:Debug>:DEBUG;_DEBUG>
-- $<$<CONFIG:Release>:NDEBUG>
-- $<$<CONFIG:MinSizeRel>:NDEBUG>
-- $<$<CONFIG:RelWithDebInfo>:NDEBUG>
++ $<$<CONFIG:Debug>:DEBUG;_DEBUG>
++ $<$<CONFIG:Release>:NDEBUG>
++ $<$<CONFIG:MinSizeRel>:NDEBUG>
++ $<$<CONFIG:RelWithDebInfo>:NDEBUG>
)
#-----------------------------------------------------------------------------
@@@ -118,9 -118,9 +118,9 @@@ enable_testing(
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
if(MSVC)
-- set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/$<CONFIG>/ CACHE
INTERNAL "" FORCE)
++ set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/$<CONFIG>/ CACHE
INTERNAL "" FORCE)
else()
-- set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/ CACHE INTERNAL ""
FORCE)
++ set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/ CACHE INTERNAL ""
FORCE)
endif()
#-----------------------------------------------------------------------------
@@@ -137,55 -137,55 +137,55 @@@ set(_init_vars
# initialize to ON
macro(option_defaults_init)
-- foreach(_var ${ARGV})
-- set(${_var} ON)
-- list(APPEND _init_vars "${_var}")
-- endforeach()
-- unset(_var)
++ foreach(_var ${ARGV})
++ set(${_var} ON)
++ list(APPEND _init_vars "${_var}")
++ endforeach()
++ unset(_var)
endmacro()
# remove from namespace
macro(option_defaults_clear)
-- foreach(_var ${_init_vars})
-- unset(${_var})
-- endforeach()
-- unset(_var)
-- unset(_init_vars)
++ foreach(_var ${_init_vars})
++ unset(${_var})
++ endforeach()
++ unset(_var)
++ unset(_init_vars)
endmacro()
# values to initialize WITH_****
option_defaults_init(
-- _init_BUILDINFO
-- _init_CODEC_FFMPEG
-- _init_CYCLES_OSL
-- _init_IMAGE_OPENEXR
-- _init_INPUT_NDOF
-- _init_JACK
-- _init_OPENCOLLADA
-- _init_OPENCOLORIO
-- _init_SDL
-- _init_FFTW3
-- _init_OPENSUBDIV
++ _init_BUILDINFO
++ _init_CODEC_FFMPEG
++ _init_CYCLES_OSL
++ _init_IMAGE_OPENEXR
++ _init_INPUT_NDOF
++ _init_JACK
++ _init_OPENCOLLADA
++ _init_OPENCOLORIO
++ _init_SDL
++ _init_FFTW3
++ _init_OPENSUBDIV
)
# customize...
if(UNIX AND NOT APPLE)
-- # some of these libraries are problematic on Linux
-- # disable less important dependencies by default
-- set(_init_CODEC_FFMPEG OFF)
-- set(_init_CYCLES_OSL OFF)
-- set(_init_IMAGE_OPENEXR OFF)
-- set(_init_JACK OFF)
-- set(_init_OPENCOLLADA OFF)
-- set(_init_OPENCOLORIO OFF)
-- set(_init_SDL OFF)
-- set(_init_FFTW3 OFF)
-- set(_init_OPENSUBDIV OFF)
++ # some of these libraries are problematic on Linux
++ # disable less important dependencies by default
++ set(_init_CODEC_FFMPEG OFF)
++ set(_init_CYCLES_OSL OFF)
++ set(_init_IMAGE_OPENEXR OFF)
++ set(_init_JACK OFF)
++ set(_init_OPENCOLLADA OFF)
++ set(_init_OPENCOLORIO OFF)
++ set(_init_SDL OFF)
++ set(_init_FFTW3 OFF)
++ set(_init_OPENSUBDIV OFF)
elseif(WIN32)
-- set(_init_JACK OFF)
++ set(_init_JACK OFF)
elseif(APPLE)
-- set(_init_JACK OFF)
++ set(_init_JACK OFF)
endif()
@@@ -194,7 -194,7 +194,7 @@@
# First platform specific non-cached vars
if(UNIX AND NOT (APPLE OR HAIKU))
-- set(WITH_X11 ON)
++ set(WITH_X11 ON)
endif()
# Blender internal features
@@@ -212,13 -212,13 +212,13 @@@ option(WITH_PYTHON_SAFETY "Enable inter
mark_as_advanced(WITH_PYTHON_SAFETY)
option(WITH_PYTHON_MODULE "Enable building as a python module which runs
without a user interface, like running regular blender in background mode
(experimental, only enable for development), installs to PYTHON_SITE_PACKAGES
(or CMAKE_INSTALL_PREFIX if WITH_INSTALL_PORTABLE is enabled)." OFF)
if(APPLE)
-- option(WITH_PYTHON_FRAMEWORK "Enable building using the Python
available in the framework (OSX only)" OFF)
++ option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in
the framework (OSX only)" OFF)
endif()
option(WITH_BUILDINFO "Include extra build details (only disable for
development & faster builds)" ${_init_BUILDINFO})
if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
-- # add_library OBJECT arg unsupported
-- set(WITH_BUILDINFO OFF)
++ # add_library OBJECT arg unsupported
++ set(WITH_BUILDINFO OFF)
endif()
set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date
for reproducible builds (empty string disables this option)")
set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time
for reproducible builds (empty string disables this option)")
@@@ -253,7 -253,7 +253,7 @@@ option(WITH_GHOST_SDL "Enable buildi
mark_as_advanced(WITH_GHOST_SDL)
if(WITH_X11)
-- option(WITH_GHOST_XDND "Enable drag'n'drop support on X11 using XDND
protocol" ON)
++ option(WITH_GHOST_XDND "Enable drag'n'drop support on X11 using XDND
protocol" ON)
endif()
# Misc...
@@@ -266,34 -266,34 +266,34 @@@ mark_as_advanced(WITH_AUDASPACE
mark_as_advanced(WITH_SYSTEM_AUDASPACE)
if(NOT WITH_AUDASPACE)
-- set(WITH_SYSTEM_AUDASPACE OFF)
++ set(WITH_SYSTEM_AUDASPACE OFF)
endif()
option(WITH_OPENMP "Enable OpenMP (has to be supported by the
compiler)" ON)
if(UNIX AND NOT APPLE)
-- option(WITH_OPENMP_STATIC "Link OpenMP statically (only used by the
release environment)" OFF)
-- mark_as_advanced(WITH_OPENMP_STATIC)
++ option(WITH_OPENMP_STATIC "Link OpenMP statically (only used by the release
environment)" OFF)
++ mark_as_advanced(WITH_OPENMP_STATIC)
endif()
if(WITH_X11)
-- option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and
unicode input)" ON)
-- option(WITH_X11_XF86VMODE "Enable X11 video mode switching"
ON)
-- option(WITH_X11_XFIXES "Enable X11 XWayland cursor warping
workaround" ON)
-- option(WITH_X11_ALPHA "Enable X11 transparent background"
ON)
++ option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode
input)" ON)
++ option(WITH_X11_XF86VMODE "Enable X11 video mode switching"
ON)
++ option(WITH_X11_XFIXES "Enable X11 XWayland cursor warping workaround"
ON)
++ option(WITH_X11_ALPHA "Enable X11 transparent background"
ON)
endif()
if(UNIX AND NOT APPLE)
-- option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by
the operating system" OFF)
-- option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the
operating system" ON)
++ option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the
operating system" OFF)
++ option(WITH_SYSTEM_GLES "Use OpenGL ES library provided by the operating
system" ON)
else()
-- # not an option for other OS's
-- set(WITH_SYSTEM_GLEW OFF)
-- set(WITH_SYSTEM_GLES OFF)
++ # not an option for other OS's
++ set(WITH_SYSTEM_GLEW OFF)
++ set(WITH_SYSTEM_GLES OFF)
endif()
if(UNIX AND NOT APPLE)
-- option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)
++ option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)
endif()
@@@ -332,17 -332,17 +332,17 @@@ option(WITH_SDL "Enable SDL f
option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
option(WITH_JACK "Enable JACK Support (http://www.jackaudio.org)"
${_init_JACK})
if(UNIX AND NOT APPLE)
-- option(WITH_JACK_DYNLOAD "Enable runtime dynamic JACK libraries
loading" OFF)
++ option(WITH_JACK_DYNLOAD "En
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
