From 3de925589fe21f77a1cc747701b4ec4798381bbd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Oct 2025 08:54:43 +1100 Subject: [PATCH] Cleanup: strip trailing space --- CMakeLists.txt | 2 +- build_files/build_environment/cmake/emhash.cmake | 2 +- build_files/build_environment/cmake/ispc.cmake | 2 +- build_files/build_environment/cmake/openimagedenoise.cmake | 2 +- build_files/build_environment/cmake/parallelhashmap.cmake | 2 +- build_files/cmake/platform/platform_win32.cmake | 2 +- source/blender/blenkernel/CMakeLists.txt | 2 +- source/creator/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fab9b3d0320..a6418b33cbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -419,7 +419,7 @@ mark_as_advanced(WITH_SYSTEM_AUDASPACE) if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE) option(WITH_RUBBERBAND "\ - Build with Rubber Band for audio time-stretching and pitch-scaling (used by Audaspace)" + Build with Rubber Band for audio time-stretching and pitch-scaling (used by Audaspace)" ON ) endif() diff --git a/build_files/build_environment/cmake/emhash.cmake b/build_files/build_environment/cmake/emhash.cmake index bd2129b4481..eadd4dc9228 100644 --- a/build_files/build_environment/cmake/emhash.cmake +++ b/build_files/build_environment/cmake/emhash.cmake @@ -20,4 +20,4 @@ ExternalProject_Add(external_emhash -DCMAKE_INSTALL_PREFIX=${LIBDIR}/emhash ${DEFAULT_CMAKE_FLAGS} ${EMHASH_EXTRA_ARGS} -) \ No newline at end of file +) diff --git a/build_files/build_environment/cmake/ispc.cmake b/build_files/build_environment/cmake/ispc.cmake index db204e3b08c..9c52baf8f52 100644 --- a/build_files/build_environment/cmake/ispc.cmake +++ b/build_files/build_environment/cmake/ispc.cmake @@ -70,7 +70,7 @@ ExternalProject_Add(external_ispc PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ispc/src/external_ispc < ${PATCH_DIR}/ispc.diff - + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc -Wno-dev diff --git a/build_files/build_environment/cmake/openimagedenoise.cmake b/build_files/build_environment/cmake/openimagedenoise.cmake index ba028ceb59b..2e59acea6ff 100644 --- a/build_files/build_environment/cmake/openimagedenoise.cmake +++ b/build_files/build_environment/cmake/openimagedenoise.cmake @@ -54,7 +54,7 @@ if(WIN32 AND NOT BLENDER_PLATFORM_ARM) # functionality. cmake_path(CONVERT $ENV{ROCM_PATH} TO_CMAKE_PATH_LIST ROCM_PATH NORMALIZE) list(APPEND OIDN_EXTRA_ARGS -DROCM_PATH=${ROCM_PATH}) - endif() + endif() set(OIDN_CMAKE_FLAGS ${DEFAULT_CLANG_CMAKE_FLAGS} -DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++.exe -DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang.exe diff --git a/build_files/build_environment/cmake/parallelhashmap.cmake b/build_files/build_environment/cmake/parallelhashmap.cmake index 2f0841c92c8..d2a7e42e4fd 100644 --- a/build_files/build_environment/cmake/parallelhashmap.cmake +++ b/build_files/build_environment/cmake/parallelhashmap.cmake @@ -16,4 +16,4 @@ ExternalProject_Add(external_parallelhashmap -DCMAKE_INSTALL_PREFIX=${LIBDIR}/parallelhashmap ${DEFAULT_CMAKE_FLAGS} ${PARALLELHASHMAP_EXTRA_ARGS} -) \ No newline at end of file +) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 5bd727ca782..7fcf2fcdb41 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -907,7 +907,7 @@ endif() if(WITH_RUBBERBAND) set(RUBBERBAND_FOUND TRUE) set(RUBBERBAND_INCLUDE_DIRS ${LIBDIR}/rubberband/include) - set(RUBBERBAND_LIBRARIES + set(RUBBERBAND_LIBRARIES optimized ${LIBDIR}/rubberband/lib/rubberband-static.lib debug ${LIBDIR}/rubberband/lib/rubberband-static_d.lib ) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index bd1ab984e9c..8e1dee7613a 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -628,7 +628,7 @@ if(WITH_AUDASPACE) ) endif() add_definitions(-DWITH_AUDASPACE) - + if(WITH_RUBBERBAND) add_definitions(-DWITH_RUBBERBAND) endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 18fae0be564..d0c4b992f87 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1425,7 +1425,7 @@ elseif(WIN32) FILES ${LIBDIR}/ffmpeg/lib/avfilter-10.dll ALL - ) + ) endif() if(EXISTS "${LIBDIR}/ffmpeg/lib/avcodec-61.dll") windows_install_shared_manifest(