Cleanup: strip trailing space
This commit is contained in:
@@ -419,7 +419,7 @@ mark_as_advanced(WITH_SYSTEM_AUDASPACE)
|
|||||||
|
|
||||||
if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
|
if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
|
||||||
option(WITH_RUBBERBAND "\
|
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
|
ON
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -20,4 +20,4 @@ ExternalProject_Add(external_emhash
|
|||||||
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/emhash
|
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/emhash
|
||||||
${DEFAULT_CMAKE_FLAGS}
|
${DEFAULT_CMAKE_FLAGS}
|
||||||
${EMHASH_EXTRA_ARGS}
|
${EMHASH_EXTRA_ARGS}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ ExternalProject_Add(external_ispc
|
|||||||
PATCH_COMMAND ${PATCH_CMD} -p 1 -d
|
PATCH_COMMAND ${PATCH_CMD} -p 1 -d
|
||||||
${BUILD_DIR}/ispc/src/external_ispc <
|
${BUILD_DIR}/ispc/src/external_ispc <
|
||||||
${PATCH_DIR}/ispc.diff
|
${PATCH_DIR}/ispc.diff
|
||||||
|
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc
|
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc
|
||||||
-Wno-dev
|
-Wno-dev
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ if(WIN32 AND NOT BLENDER_PLATFORM_ARM)
|
|||||||
# functionality.
|
# functionality.
|
||||||
cmake_path(CONVERT $ENV{ROCM_PATH} TO_CMAKE_PATH_LIST ROCM_PATH NORMALIZE)
|
cmake_path(CONVERT $ENV{ROCM_PATH} TO_CMAKE_PATH_LIST ROCM_PATH NORMALIZE)
|
||||||
list(APPEND OIDN_EXTRA_ARGS -DROCM_PATH=${ROCM_PATH})
|
list(APPEND OIDN_EXTRA_ARGS -DROCM_PATH=${ROCM_PATH})
|
||||||
endif()
|
endif()
|
||||||
set(OIDN_CMAKE_FLAGS ${DEFAULT_CLANG_CMAKE_FLAGS}
|
set(OIDN_CMAKE_FLAGS ${DEFAULT_CLANG_CMAKE_FLAGS}
|
||||||
-DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++.exe
|
-DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++.exe
|
||||||
-DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang.exe
|
-DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang.exe
|
||||||
|
|||||||
@@ -16,4 +16,4 @@ ExternalProject_Add(external_parallelhashmap
|
|||||||
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/parallelhashmap
|
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/parallelhashmap
|
||||||
${DEFAULT_CMAKE_FLAGS}
|
${DEFAULT_CMAKE_FLAGS}
|
||||||
${PARALLELHASHMAP_EXTRA_ARGS}
|
${PARALLELHASHMAP_EXTRA_ARGS}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -907,7 +907,7 @@ endif()
|
|||||||
if(WITH_RUBBERBAND)
|
if(WITH_RUBBERBAND)
|
||||||
set(RUBBERBAND_FOUND TRUE)
|
set(RUBBERBAND_FOUND TRUE)
|
||||||
set(RUBBERBAND_INCLUDE_DIRS ${LIBDIR}/rubberband/include)
|
set(RUBBERBAND_INCLUDE_DIRS ${LIBDIR}/rubberband/include)
|
||||||
set(RUBBERBAND_LIBRARIES
|
set(RUBBERBAND_LIBRARIES
|
||||||
optimized ${LIBDIR}/rubberband/lib/rubberband-static.lib
|
optimized ${LIBDIR}/rubberband/lib/rubberband-static.lib
|
||||||
debug ${LIBDIR}/rubberband/lib/rubberband-static_d.lib
|
debug ${LIBDIR}/rubberband/lib/rubberband-static_d.lib
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -628,7 +628,7 @@ if(WITH_AUDASPACE)
|
|||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
add_definitions(-DWITH_AUDASPACE)
|
add_definitions(-DWITH_AUDASPACE)
|
||||||
|
|
||||||
if(WITH_RUBBERBAND)
|
if(WITH_RUBBERBAND)
|
||||||
add_definitions(-DWITH_RUBBERBAND)
|
add_definitions(-DWITH_RUBBERBAND)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -1425,7 +1425,7 @@ elseif(WIN32)
|
|||||||
FILES
|
FILES
|
||||||
${LIBDIR}/ffmpeg/lib/avfilter-10.dll
|
${LIBDIR}/ffmpeg/lib/avfilter-10.dll
|
||||||
ALL
|
ALL
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
if(EXISTS "${LIBDIR}/ffmpeg/lib/avcodec-61.dll")
|
if(EXISTS "${LIBDIR}/ffmpeg/lib/avcodec-61.dll")
|
||||||
windows_install_shared_manifest(
|
windows_install_shared_manifest(
|
||||||
|
|||||||
Reference in New Issue
Block a user