From 0c282c068f1a132b1689ca0d5142a86a6d238895 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 29 Sep 2022 12:00:18 +1000 Subject: [PATCH] Cleanup: cmake indentation --- CMakeLists.txt | 6 +++--- build_files/build_environment/cmake/dpcpp.cmake | 2 +- build_files/cmake/Modules/FindSYCL.cmake | 2 +- build_files/cmake/platform/platform_apple.cmake | 4 ++-- build_files/cmake/platform/platform_unix.cmake | 2 +- intern/cycles/cmake/external_libs.cmake | 2 +- source/creator/CMakeLists.txt | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68eb07e34f2..514896161a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -648,8 +648,8 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") unset(_asan_defaults) if(MSVC) - find_library( - COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64 + find_library( + COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64 PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows @@ -828,7 +828,7 @@ endif() set_and_warn_dependency(WITH_PUGIXML WITH_OPENIMAGEIO OFF) if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR - WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD OR WITH_ALEMBIC)) + WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD OR WITH_ALEMBIC)) message(STATUS "No dependencies need 'WITH_BOOST' forcing WITH_BOOST=OFF") set(WITH_BOOST OFF) endif() diff --git a/build_files/build_environment/cmake/dpcpp.cmake b/build_files/build_environment/cmake/dpcpp.cmake index 3c3fe201073..dbba97b8264 100644 --- a/build_files/build_environment/cmake/dpcpp.cmake +++ b/build_files/build_environment/cmake/dpcpp.cmake @@ -68,7 +68,7 @@ set(DPCPP_EXTRA_ARGS ) if(WIN32) - list(APPEND DPCPP_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER) + list(APPEND DPCPP_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER) endif() ExternalProject_Add(external_dpcpp diff --git a/build_files/cmake/Modules/FindSYCL.cmake b/build_files/cmake/Modules/FindSYCL.cmake index ac90cbfbe43..7aead43dd2a 100644 --- a/build_files/cmake/Modules/FindSYCL.cmake +++ b/build_files/cmake/Modules/FindSYCL.cmake @@ -44,7 +44,7 @@ FIND_PROGRAM(SYCL_COMPILER # compiler. if(NOT SYCL_COMPILER) FIND_PROGRAM(SYCL_COMPILER - NAMES + NAMES dpcpp HINTS ${_sycl_search_dirs} diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 2d1803ec376..04fa1561f88 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -30,7 +30,7 @@ macro(add_bundled_libraries library) list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${_library_dir}) unset(_all_library_versions) unset(_library_dir) - endif() + endif() endmacro() # ------------------------------------------------------------------------ @@ -324,7 +324,7 @@ if(WITH_LLVM) if(WITH_CLANG) find_package(Clang) if(NOT CLANG_FOUND) - message(FATAL_ERROR "Clang not found.") + message(FATAL_ERROR "Clang not found.") endif() endif() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 6ad4547fa00..47410b5f368 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -89,7 +89,7 @@ macro(add_bundled_libraries library) file(GLOB _all_library_versions ${LIBDIR}/${library}/lib/*\.so*) list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_all_library_versions}) unset(_all_library_versions) - endif() + endif() endmacro() # ---------------------------------------------------------------------------- diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 184bf7d6ae3..ac508e36965 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -545,7 +545,7 @@ endif() if(CYCLES_STANDALONE_REPOSITORY) if((WITH_CYCLES_STANDALONE AND WITH_CYCLES_STANDALONE_GUI) OR - WITH_CYCLES_HYDRA_RENDER_DELEGATE) + WITH_CYCLES_HYDRA_RENDER_DELEGATE) if(MSVC AND EXISTS ${_cycles_lib_dir}) set(Epoxy_LIBRARIES "${_cycles_lib_dir}/epoxy/lib/epoxy.lib") set(Epoxy_INCLUDE_DIRS "${_cycles_lib_dir}/epoxy/include") diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 05577406b48..13a311cb55c 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1157,10 +1157,10 @@ elseif(APPLE) ) if(WITH_BLENDER_THUMBNAILER) - install( - TARGETS blender-thumbnailer - DESTINATION Blender.app/Contents/MacOS/ - ) + install( + TARGETS blender-thumbnailer + DESTINATION Blender.app/Contents/MacOS/ + ) endif() if(PLATFORM_BUNDLED_LIBRARIES AND TARGETDIR_LIB)