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/app/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/app/CMakeLists.txt')
-rw-r--r-- | intern/cycles/app/CMakeLists.txt | 202 |
1 files changed, 101 insertions, 101 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 2d7db860b09..36e3e179be5 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -1,6 +1,6 @@ set(INC - .. + .. ) set(INC_SYS ) @@ -8,46 +8,46 @@ set(INC_SYS # NOTE: LIBRARIES contains all the libraries which are common # across release and debug build types, stored in a linking order. set(LIBRARIES - cycles_device - cycles_kernel - cycles_render - cycles_bvh - cycles_subd - cycles_graph - cycles_util - ${BLENDER_GL_LIBRARIES} - ${CYCLES_APP_GLEW_LIBRARY} - ${PNG_LIBRARIES} - ${JPEG_LIBRARIES} - ${ZLIB_LIBRARIES} - ${TIFF_LIBRARY} - ${PTHREADS_LIBRARIES} - extern_clew + cycles_device + cycles_kernel + cycles_render + cycles_bvh + cycles_subd + cycles_graph + cycles_util + ${BLENDER_GL_LIBRARIES} + ${CYCLES_APP_GLEW_LIBRARY} + ${PNG_LIBRARIES} + ${JPEG_LIBRARIES} + ${ZLIB_LIBRARIES} + ${TIFF_LIBRARY} + ${PTHREADS_LIBRARIES} + extern_clew ) if(WITH_CUDA_DYNLOAD) - list(APPEND LIBRARIES extern_cuew) + list(APPEND LIBRARIES extern_cuew) else() - list(APPEND LIBRARIES ${CUDA_CUDA_LIBRARY}) + list(APPEND LIBRARIES ${CUDA_CUDA_LIBRARY}) endif() if(WITH_CYCLES_OSL) - list(APPEND LIBRARIES cycles_kernel_osl) + list(APPEND LIBRARIES cycles_kernel_osl) endif() if(NOT CYCLES_STANDALONE_REPOSITORY) - list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc bf_intern_numaapi) + list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc bf_intern_numaapi) endif() if(WITH_CYCLES_LOGGING) - list(APPEND LIBRARIES - ${GLOG_LIBRARIES} - ${GFLAGS_LIBRARIES} - ) + list(APPEND LIBRARIES + ${GLOG_LIBRARIES} + ${GFLAGS_LIBRARIES} + ) endif() if(WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) - list(APPEND LIBRARIES ${GLUT_LIBRARIES}) + list(APPEND LIBRARIES ${GLUT_LIBRARIES}) endif() # Common configuration. @@ -62,7 +62,7 @@ link_directories(${OPENIMAGEIO_LIBPATH} ${OPENJPEG_LIBPATH}) if(WITH_OPENCOLORIO) - link_directories(${OPENCOLORIO_LIBPATH}) + link_directories(${OPENCOLORIO_LIBPATH}) endif() add_definitions(${GL_DEFINITIONS}) @@ -78,90 +78,90 @@ include_directories(SYSTEM ${INC_SYS}) # # TODO(sergey): Think of a better place for this? macro(cycles_target_link_libraries target) - target_link_libraries(${target} ${LIBRARIES}) - if(WITH_CYCLES_OSL) - target_link_libraries(${target} ${OSL_LIBRARIES} ${LLVM_LIBRARIES}) - endif() - if(WITH_CYCLES_EMBREE) - target_link_libraries(${target} ${EMBREE_LIBRARIES}) - endif() - if(WITH_OPENSUBDIV) - target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES}) - endif() - if(WITH_OPENCOLORIO) - target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES}) - endif() - target_link_libraries( - ${target} - ${OPENIMAGEIO_LIBRARIES} - ${OPENEXR_LIBRARIES} - ${OPENJPEG_LIBRARIES} - ${PUGIXML_LIBRARIES} - ${BOOST_LIBRARIES} - ${CMAKE_DL_LIBS} - ${PLATFORM_LINKLIBS} - ) + target_link_libraries(${target} ${LIBRARIES}) + if(WITH_CYCLES_OSL) + target_link_libraries(${target} ${OSL_LIBRARIES} ${LLVM_LIBRARIES}) + endif() + if(WITH_CYCLES_EMBREE) + target_link_libraries(${target} ${EMBREE_LIBRARIES}) + endif() + if(WITH_OPENSUBDIV) + target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES}) + endif() + if(WITH_OPENCOLORIO) + target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES}) + endif() + target_link_libraries( + ${target} + ${OPENIMAGEIO_LIBRARIES} + ${OPENEXR_LIBRARIES} + ${OPENJPEG_LIBRARIES} + ${PUGIXML_LIBRARIES} + ${BOOST_LIBRARIES} + ${CMAKE_DL_LIBS} + ${PLATFORM_LINKLIBS} + ) endmacro() # Application build targets if(WITH_CYCLES_STANDALONE) - set(SRC - cycles_standalone.cpp - cycles_xml.cpp - cycles_xml.h - ) - add_executable(cycles ${SRC}) - cycles_target_link_libraries(cycles) - - if(UNIX AND NOT APPLE) - set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib) - endif() - unset(SRC) + set(SRC + cycles_standalone.cpp + cycles_xml.cpp + cycles_xml.h + ) + add_executable(cycles ${SRC}) + cycles_target_link_libraries(cycles) + + if(UNIX AND NOT APPLE) + set_target_properties(cycles PROPERTIES INSTALL_RPATH $ORIGIN/lib) + endif() + unset(SRC) endif() if(WITH_CYCLES_NETWORK) - set(SRC - cycles_server.cpp - ) - add_executable(cycles_server ${SRC}) - cycles_target_link_libraries(cycles_server) - - if(UNIX AND NOT APPLE) - set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib) - endif() - unset(SRC) + set(SRC + cycles_server.cpp + ) + add_executable(cycles_server ${SRC}) + cycles_target_link_libraries(cycles_server) + + if(UNIX AND NOT APPLE) + set_target_properties(cycles_server PROPERTIES INSTALL_RPATH $ORIGIN/lib) + endif() + unset(SRC) endif() if(WITH_CYCLES_CUBIN_COMPILER) - # 32 bit windows is special, nvrtc is not supported on x86, so even - # though we are building 32 bit blender a 64 bit cubin_cc will have - # to be build to compile the cubins. - if(MSVC AND NOT CMAKE_CL_64) - message("Building with CUDA not supported on 32 bit, skipped") - set(WITH_CYCLES_CUDA_BINARIES OFF CACHE BOOL "" FORCE) - else() - set(SRC - cycles_cubin_cc.cpp - ) - set(INC - ../../../extern/cuew/include - ) - add_executable(cycles_cubin_cc ${SRC}) - include_directories(${INC}) - target_link_libraries(cycles_cubin_cc - extern_cuew - ${OPENIMAGEIO_LIBRARIES} - ${OPENEXR_LIBRARIES} - ${OPENJPEG_LIBRARIES} - ${PUGIXML_LIBRARIES} - ${BOOST_LIBRARIES} - ${PLATFORM_LINKLIBS} - ) - if(NOT CYCLES_STANDALONE_REPOSITORY) - target_link_libraries(cycles_cubin_cc bf_intern_guardedalloc) - endif() - unset(SRC) - unset(INC) - endif() + # 32 bit windows is special, nvrtc is not supported on x86, so even + # though we are building 32 bit blender a 64 bit cubin_cc will have + # to be build to compile the cubins. + if(MSVC AND NOT CMAKE_CL_64) + message("Building with CUDA not supported on 32 bit, skipped") + set(WITH_CYCLES_CUDA_BINARIES OFF CACHE BOOL "" FORCE) + else() + set(SRC + cycles_cubin_cc.cpp + ) + set(INC + ../../../extern/cuew/include + ) + add_executable(cycles_cubin_cc ${SRC}) + include_directories(${INC}) + target_link_libraries(cycles_cubin_cc + extern_cuew + ${OPENIMAGEIO_LIBRARIES} + ${OPENEXR_LIBRARIES} + ${OPENJPEG_LIBRARIES} + ${PUGIXML_LIBRARIES} + ${BOOST_LIBRARIES} + ${PLATFORM_LINKLIBS} + ) + if(NOT CYCLES_STANDALONE_REPOSITORY) + target_link_libraries(cycles_cubin_cc bf_intern_guardedalloc) + endif() + unset(SRC) + unset(INC) + endif() endif() |