Cleanup: remove trailing space
This commit is contained in:
@@ -94,9 +94,9 @@ if(MSVC)
|
||||
add_custom_target(Package_Python
|
||||
ALL
|
||||
DEPENDS
|
||||
external_python
|
||||
external_numpy
|
||||
external_python_site_packages
|
||||
external_python
|
||||
external_numpy
|
||||
external_python_site_packages
|
||||
external_zstandard
|
||||
external_cython
|
||||
OUTPUT
|
||||
|
||||
@@ -132,20 +132,20 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/m4.exe")
|
||||
)
|
||||
|
||||
message(STATUS "Installing required packages")
|
||||
|
||||
|
||||
if(NOT BLENDER_PLATFORM_WINDOWS_ARM)
|
||||
# A newer runtime package is required since the tools downloaded in the next step
|
||||
# depend on it, we however cannot update the runtime from a msys2_shell.cmd since
|
||||
# bash.exe will lock the runtime dlls so we execute pacman directly.
|
||||
# bash.exe will lock the runtime dlls so we execute pacman directly.
|
||||
#
|
||||
# For now only run this on X64 as there are some known issues (but unknown to me)
|
||||
# with newer msys2 on Windows on ARM.
|
||||
# with newer msys2 on Windows on ARM.
|
||||
execute_process(
|
||||
COMMAND ${DOWNLOAD_DIR}/msys2/msys64/usr/bin/pacman -S msys2-runtime --noconfirm
|
||||
COMMAND ${DOWNLOAD_DIR}/msys2/msys64/usr/bin/pacman -S msys2-runtime --noconfirm
|
||||
WORKING_DIRECTORY ${DOWNLOAD_DIR}/msys2/msys64
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
execute_process(
|
||||
COMMAND ${DOWNLOAD_DIR}/msys2/msys64/msys2_shell.cmd -defterm -no-start -clang64 -c
|
||||
"pacman -S patch m4 coreutils pkgconf make diffutils autoconf-wrapper --noconfirm && exit"
|
||||
|
||||
@@ -41,7 +41,7 @@ if(WIN32)
|
||||
${LIBDIR}/zstd/include/
|
||||
${HARVEST_TARGET}/zstd/include/
|
||||
# The zstandard python extention hardcoded links to ztsd.lib
|
||||
COMMAND ${CMAKE_COMMAND} -E copy
|
||||
COMMAND ${CMAKE_COMMAND} -E copy
|
||||
${LIBDIR}/zstd/lib/zstd_static${LIBEXT}
|
||||
${LIBDIR}/zstd/lib/zstd${LIBEXT}
|
||||
DEPENDEES install
|
||||
@@ -49,7 +49,7 @@ if(WIN32)
|
||||
else()
|
||||
ExternalProject_Add_Step(external_zstd after_install
|
||||
# The zstandard python extention hardcoded links to ztsd.lib
|
||||
COMMAND ${CMAKE_COMMAND} -E copy
|
||||
COMMAND ${CMAKE_COMMAND} -E copy
|
||||
${LIBDIR}/zstd/lib/zstd_static${LIBEXT}
|
||||
${LIBDIR}/zstd/lib/zstd${LIBEXT}
|
||||
DEPENDEES install
|
||||
|
||||
Reference in New Issue
Block a user