diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-09-07 16:12:34 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-09-07 16:12:34 +0300 |
| commit | 0774fdbeb67dc3acdf90b2dabd920dc9cd1ca521 (patch) | |
| tree | 16d78acf87be75cf88a0547e781081345cd81b19 /intern/cycles | |
| parent | 0e5aa49e1d0edab553a3054b298a8c2f5ecaa16f (diff) | |
Cleanup: tabs in CMake files
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 22 | ||||
| -rw-r--r-- | intern/cycles/cmake/macros.cmake | 8 |
2 files changed, 15 insertions, 15 deletions
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() |