diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-03-04 02:47:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-04 03:02:35 +0300 |
| commit | a5c984a57d5fef45677876af15bff39632e5f552 (patch) | |
| tree | ea841610c45199fa9eb5d20d1573b63bcaba00a2 /build_files | |
| parent | d09c5bdc28a17e3c1cdfdd9805c50508894878dc (diff) | |
Cleanup: cmake indentation
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 14 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 10 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 4 |
3 files changed, 15 insertions, 13 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index cb45d30c664..6287da55580 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -947,7 +947,7 @@ function(data_to_c_simple set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE) endfunction() -# macro for converting pixmap directory to a png and then a c file +# Function for converting pixmap directory to a '.png' and then a '.c' file. function(data_to_c_simple_icons path_from icon_prefix icon_names list_to_add @@ -1160,12 +1160,12 @@ macro(blender_precompile_headers target cpp header) endmacro() macro(set_and_warn_dependency - _dependency _setting _val) - # when $_dependency is disabled, forces $_setting = $_val - if(NOT ${${_dependency}} AND ${${_setting}}) - message(STATUS "'${_dependency}' is disabled: forcing 'set(${_setting} ${_val})'") - set(${_setting} ${_val}) - endif() + _dependency _setting _val) + # when $_dependency is disabled, forces $_setting = $_val + if(NOT ${${_dependency}} AND ${${_setting}}) + message(STATUS "'${_dependency}' is disabled: forcing 'set(${_setting} ${_val})'") + set(${_setting} ${_val}) + endif() endmacro() macro(without_system_libs_begin) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index e997f105324..123eb3ef7a0 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -411,11 +411,13 @@ if(WITH_OPENMP) # Copy libomp.dylib to allow executables like datatoc and tests to work. execute_process( - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib - COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib) + COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib + COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib + ) execute_process( - COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib - COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib) + COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib + COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib + ) endif() endif() diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index c3d00d25425..7ba7e3999e4 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -671,8 +671,8 @@ if(WITH_USD) set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib) set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib/usd) set(USD_LIBRARIES - debug ${USD_DEBUG_LIB} - optimized ${USD_RELEASE_LIB} + debug ${USD_DEBUG_LIB} + optimized ${USD_RELEASE_LIB} ) endif() endif() |