Commit: 0774fdbeb67dc3acdf90b2dabd920dc9cd1ca521 Author: Campbell Barton Date: Mon Sep 7 23:12:34 2020 +1000 Branches: master https://developer.blender.org/rB0774fdbeb67dc3acdf90b2dabd920dc9cd1ca521
Cleanup: tabs in CMake files =================================================================== M intern/cycles/cmake/external_libs.cmake M intern/cycles/cmake/macros.cmake =================================================================== diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index e84dc7a1fca..b29f392a754 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -18,9 +18,9 @@ ########################################################################### macro(_set_default variable value) - if(NOT ${variable}) - set(${variable} ${value}) - endif() + if(NOT ${variable}) + set(${variable} ${value}) + endif() endmacro() ########################################################################### @@ -233,14 +233,14 @@ if(WITH_CYCLES_OSL) unset(_llvm_libs_release) set(OSL_LIBRARIES - optimized ${OSL_ROOT_DIR}/lib/oslcomp.lib - optimized ${OSL_ROOT_DIR}/lib/oslexec.lib - optimized ${OSL_ROOT_DIR}/lib/oslquery.lib - optimized ${OSL_ROOT_DIR}/lib/pugixml.lib - debug ${OSL_ROOT_DIR}/lib/oslcomp_d.lib - debug ${OSL_ROOT_DIR}/lib/oslexec_d.lib - debug ${OSL_ROOT_DIR}/lib/oslquery_d.lib - debug ${OSL_ROOT_DIR}/lib/pugixml_d.lib + optimized ${OSL_ROOT_DIR}/lib/oslcomp.lib + optimized ${OSL_ROOT_DIR}/lib/oslexec.lib + optimized ${OSL_ROOT_DIR}/lib/oslquery.lib + optimized ${OSL_ROOT_DIR}/lib/pugixml.lib + debug ${OSL_ROOT_DIR}/lib/oslcomp_d.lib + debug ${OSL_ROOT_DIR}/lib/oslexec_d.lib + debug ${OSL_ROOT_DIR}/lib/oslquery_d.lib + debug ${OSL_ROOT_DIR}/lib/pugixml_d.lib ) endif() endif() diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake index ad20916d471..c5fe5f672c0 100644 --- a/intern/cycles/cmake/macros.cmake +++ b/intern/cycles/cmake/macros.cmake @@ -182,15 +182,15 @@ macro(cycles_install_libraries target) if(CMAKE_BUILD_TYPE STREQUAL "Debug") install( FILES - ${TBB_ROOT_DIR}/lib/debug/tbb_debug${CMAKE_SHARED_LIBRARY_SUFFIX} + ${TBB_ROOT_DIR}/lib/debug/tbb_debug${CMAKE_SHARED_LIBRARY_SUFFIX} ${OPENVDB_ROOT_DIR}/bin/openvdb_d${CMAKE_SHARED_LIBRARY_SUFFIX} - DESTINATION $<TARGET_FILE_DIR:${target}>) + DESTINATION $<TARGET_FILE_DIR:${target}>) else() install( FILES - ${TBB_ROOT_DIR}/lib/tbb${CMAKE_SHARED_LIBRARY_SUFFIX} + ${TBB_ROOT_DIR}/lib/tbb${CMAKE_SHARED_LIBRARY_SUFFIX} ${OPENVDB_ROOT_DIR}/bin/openvdb${CMAKE_SHARED_LIBRARY_SUFFIX} - DESTINATION $<TARGET_FILE_DIR:${target}>) + DESTINATION $<TARGET_FILE_DIR:${target}>) endif() endif() endmacro() _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs