[Bf-blender-cvs] [3076d95ba44] master: Cleanup: use 2 space indentation for CMake
Campbell Barton
noreply at git.blender.org
Wed Apr 17 06:37:48 CEST 2019
Commit: 3076d95ba441cd32706a27d18922a30f8fd28b8a
Author: Campbell Barton
Date: Wed Apr 17 06:35:54 2019 +0200
Branches: master
https://developer.blender.org/rB3076d95ba441cd32706a27d18922a30f8fd28b8a
Cleanup: use 2 space indentation for CMake
===================================================================
M CMakeLists.txt
M build_files/build_environment/CMakeLists.txt
M build_files/build_environment/cmake/alembic.cmake
M build_files/build_environment/cmake/blendthumb.cmake
M build_files/build_environment/cmake/blosc.cmake
M build_files/build_environment/cmake/boost.cmake
M build_files/build_environment/cmake/bzip2.cmake
M build_files/build_environment/cmake/clang.cmake
M build_files/build_environment/cmake/clew.cmake
M build_files/build_environment/cmake/cuew.cmake
M build_files/build_environment/cmake/embree.cmake
M build_files/build_environment/cmake/faad.cmake
M build_files/build_environment/cmake/ffi.cmake
M build_files/build_environment/cmake/ffmpeg.cmake
M build_files/build_environment/cmake/fftw.cmake
M build_files/build_environment/cmake/flac.cmake
M build_files/build_environment/cmake/flexbison.cmake
M build_files/build_environment/cmake/freeglut.cmake
M build_files/build_environment/cmake/freetype.cmake
M build_files/build_environment/cmake/glew.cmake
M build_files/build_environment/cmake/glfw.cmake
M build_files/build_environment/cmake/harvest.cmake
M build_files/build_environment/cmake/hdf5.cmake
M build_files/build_environment/cmake/hidapi.cmake
M build_files/build_environment/cmake/iconv.cmake
M build_files/build_environment/cmake/ilmbase.cmake
M build_files/build_environment/cmake/jemalloc.cmake
M build_files/build_environment/cmake/jpeg.cmake
M build_files/build_environment/cmake/lame.cmake
M build_files/build_environment/cmake/lcms.cmake
M build_files/build_environment/cmake/llvm.cmake
M build_files/build_environment/cmake/lzma.cmake
M build_files/build_environment/cmake/numpy.cmake
M build_files/build_environment/cmake/ogg.cmake
M build_files/build_environment/cmake/openal.cmake
M build_files/build_environment/cmake/opencollada.cmake
M build_files/build_environment/cmake/opencolorio.cmake
M build_files/build_environment/cmake/openexr.cmake
M build_files/build_environment/cmake/openimageio.cmake
M build_files/build_environment/cmake/openjpeg.cmake
M build_files/build_environment/cmake/openmp.cmake
M build_files/build_environment/cmake/opensubdiv.cmake
M build_files/build_environment/cmake/openvdb.cmake
M build_files/build_environment/cmake/options.cmake
M build_files/build_environment/cmake/osl.cmake
M build_files/build_environment/cmake/png.cmake
M build_files/build_environment/cmake/pthreads.cmake
M build_files/build_environment/cmake/pugixml.cmake
M build_files/build_environment/cmake/python.cmake
M build_files/build_environment/cmake/python_site_packages.cmake
M build_files/build_environment/cmake/sdl.cmake
M build_files/build_environment/cmake/setup_mingw32.cmake
M build_files/build_environment/cmake/setup_mingw64.cmake
M build_files/build_environment/cmake/sndfile.cmake
M build_files/build_environment/cmake/spnav.cmake
M build_files/build_environment/cmake/sqlite.cmake
M build_files/build_environment/cmake/ssl.cmake
M build_files/build_environment/cmake/tbb.cmake
M build_files/build_environment/cmake/theora.cmake
M build_files/build_environment/cmake/tiff.cmake
M build_files/build_environment/cmake/tinyxml.cmake
M build_files/build_environment/cmake/versions.cmake
M build_files/build_environment/cmake/vorbis.cmake
M build_files/build_environment/cmake/vpx.cmake
M build_files/build_environment/cmake/webp.cmake
M build_files/build_environment/cmake/x264.cmake
M build_files/build_environment/cmake/xml2.cmake
M build_files/build_environment/cmake/xvidcore.cmake
M build_files/build_environment/cmake/yamlcpp.cmake
M build_files/build_environment/cmake/zlib.cmake
M build_files/build_environment/cmake/zlib_mingw.cmake
M build_files/buildbot/config/blender_linux.cmake
M build_files/cmake/Modules/FindGLEW.cmake
M build_files/cmake/Modules/FindLLVM.cmake
M build_files/cmake/Modules/FindSndFile.cmake
M build_files/cmake/Modules/GTestTesting.cmake
M build_files/cmake/RpmBuild.cmake
M build_files/cmake/buildinfo.cmake
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
M build_files/cmake/config/bpy_module.cmake
M build_files/cmake/macros.cmake
M build_files/cmake/packaging.cmake
M build_files/cmake/platform/platform_apple.cmake
M build_files/cmake/platform/platform_apple_xcode.cmake
M build_files/cmake/platform/platform_unix.cmake
M build_files/cmake/platform/platform_win32.cmake
M extern/CMakeLists.txt
M extern/audaspace/CMakeLists.txt
M extern/audaspace/blender_config.cmake
M extern/binreloc/CMakeLists.txt
M extern/bullet2/CMakeLists.txt
M extern/ceres/CMakeLists.txt
M extern/ceres/bundle.sh
M extern/clew/CMakeLists.txt
M extern/cuew/CMakeLists.txt
M extern/curve_fit_nd/CMakeLists.txt
M extern/draco/dracoenc/CMakeLists.txt
M extern/gflags/CMakeLists.txt
M extern/glew-es/CMakeLists.txt
M extern/glew/CMakeLists.txt
M extern/glog/CMakeLists.txt
M extern/gtest/CMakeLists.txt
M extern/lzma/CMakeLists.txt
M extern/lzo/CMakeLists.txt
M extern/rangetree/CMakeLists.txt
M extern/sdlew/CMakeLists.txt
M extern/wcwidth/CMakeLists.txt
M extern/xdnd/CMakeLists.txt
M intern/CMakeLists.txt
M intern/elbeem/CMakeLists.txt
M intern/itasc/CMakeLists.txt
M intern/libmv/CMakeLists.txt
M intern/libmv/bundle.sh
M intern/numaapi/CMakeLists.txt
M intern/smoke/CMakeLists.txt
M release/windows/blendthumb/CMakeLists.txt
M tests/CMakeLists.txt
M tests/python/CMakeLists.txt
M tests/python/collada/CMakeLists.txt
M tests/python/view_layer/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f5b8240c88..7ab5655bff4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 @@ cmake_minimum_required(VERSION 3.5)
# 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 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/platform")
# 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 @@ endif()
# 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 @@ 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 @@ 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 @@ endif()
# 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 @@ option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid d
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 @@ option(WITH_GHOST_SDL "Enable building Blender against SDL for windowing rath
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 @@ 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 @@ option(WITH_SDL "Enable SDL for sound and joystick support" ${_init_SD
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 "Enable runtime dynamic JACK libraries loading" OFF)
endif()
if(UNIX AND NOT APPLE)
- option(WITH_SDL_DYNLOAD "Enable runtime dynami
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list