diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /intern/cycles/blender/CMakeLists.txt | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'intern/cycles/blender/CMakeLists.txt')
-rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index fc265a47a01..7354b1e615e 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -1,68 +1,68 @@ set(INC - .. - ../../glew-mx - ../../guardedalloc - ../../mikktspace - ../../../source/blender/makesdna - ../../../source/blender/makesrna - ../../../source/blender/blenlib - ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern + .. + ../../glew-mx + ../../guardedalloc + ../../mikktspace + ../../../source/blender/makesdna + ../../../source/blender/makesrna + ../../../source/blender/blenlib + ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern ) set(INC_SYS - ${PYTHON_INCLUDE_DIRS} - ${GLEW_INCLUDE_DIR} + ${PYTHON_INCLUDE_DIRS} + ${GLEW_INCLUDE_DIR} ) set(SRC - blender_camera.cpp - blender_device.cpp - blender_mesh.cpp - blender_object.cpp - blender_object_cull.cpp - blender_particles.cpp - blender_curves.cpp - blender_logging.cpp - blender_python.cpp - blender_session.cpp - blender_shader.cpp - blender_sync.cpp - blender_texture.cpp + blender_camera.cpp + blender_device.cpp + blender_mesh.cpp + blender_object.cpp + blender_object_cull.cpp + blender_particles.cpp + blender_curves.cpp + blender_logging.cpp + blender_python.cpp + blender_session.cpp + blender_shader.cpp + blender_sync.cpp + blender_texture.cpp - CCL_api.h - blender_object_cull.h - blender_sync.h - blender_session.h - blender_texture.h - blender_util.h + CCL_api.h + blender_object_cull.h + blender_sync.h + blender_session.h + blender_texture.h + blender_util.h ) set(LIB - cycles_bvh - cycles_device - cycles_graph - cycles_kernel - cycles_render - cycles_subd - cycles_util + cycles_bvh + cycles_device + cycles_graph + cycles_kernel + cycles_render + cycles_subd + cycles_util ) if(WITH_CYCLES_LOGGING) - list(APPEND LIB - extern_glog - ) + list(APPEND LIB + extern_glog + ) endif() set(ADDON_FILES - addon/__init__.py - addon/engine.py - addon/operators.py - addon/osl.py - addon/presets.py - addon/properties.py - addon/ui.py - addon/version_update.py + addon/__init__.py + addon/engine.py + addon/operators.py + addon/osl.py + addon/presets.py + addon/properties.py + addon/ui.py + addon/version_update.py ) add_definitions(${GL_DEFINITIONS}) @@ -72,14 +72,14 @@ if(WITH_CYCLES_DEVICE_OPENCL) endif() if(WITH_CYCLES_NETWORK) - add_definitions(-DWITH_NETWORK) + add_definitions(-DWITH_NETWORK) endif() blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # avoid link failure with clang 3.4 debug if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4') - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gline-tables-only") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -gline-tables-only") endif() add_dependencies(bf_intern_cycles bf_rna) |