Revert changes from main commits that were merged into blender-v4.1-release

The last good commit was 4bf6a2e564.

.clang-format

@@ -278,6 +278,3 @@ StatementMacros:
 
 MacroBlockBegin: "^OSL_CLOSURE_STRUCT_BEGIN$"
 MacroBlockEnd: "^OSL_CLOSURE_STRUCT_END$"
-
-# Ensure new line at the end of source files.
-InsertNewlineAtEOF: True

GNUmakefile

@@ -535,7 +535,7 @@ check_spelling_shaders: .FORCE
 	    "$(BLENDER_DIR)/source/"
 
 check_descriptions: .FORCE
-	@$(BLENDER_BIN) --background --factory-startup --python \
+	@$(BLENDER_BIN) --background -noaudio --factory-startup --python \
 	    "$(BLENDER_DIR)/tools/check_source/check_descriptions.py"
 
 check_deprecated: .FORCE
@@ -598,7 +598,7 @@ format: .FORCE
 doc_py: .FORCE
 	@ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
 	$(BLENDER_BIN) \
-	    --background --factory-startup \
+	    --background -noaudio --factory-startup \
 	    --python doc/python_api/sphinx_doc_gen.py
 	@sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
@@ -609,7 +609,7 @@ doc_doxy: .FORCE
 
 doc_dna: .FORCE
 	@$(BLENDER_BIN) \
-	    --background --factory-startup \
+	    --background -noaudio --factory-startup \
 	    --python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 

build_files/build_environment/cmake/alembic.cmake

@@ -21,32 +21,20 @@ ExternalProject_Add(external_alembic
   URL_HASH ${ALEMBIC_HASH_TYPE}=${ALEMBIC_HASH}
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/alembic
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic
-    -Wno-dev
-    ${DEFAULT_CMAKE_FLAGS}
-    ${ALEMBIC_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/alembic
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_alembic after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic
-        ${LIBDIR}/alembic
-        ${HARVEST_TARGET}/alembic
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_alembic after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
-        ${LIBDIR}/alembic/lib/alembic.lib
-        ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/aom.cmake

@@ -24,19 +24,10 @@ ExternalProject_Add(external_aom
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${AOM_HASH_TYPE}=${AOM_HASH}
   PREFIX ${BUILD_DIR}/aom
-
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/aom/src/external_aom < ${PATCH_DIR}/aom.diff
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d
-    ${BUILD_DIR}/aom/src/external_aom <
-    ${PATCH_DIR}/aom.diff
-
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/aom/src/external_aom-build/ &&
-    ${CMAKE_COMMAND}
+    ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/aom ${AOM_CMAKE_FLAGS} ${AOM_EXTRA_ARGS} ${BUILD_DIR}/aom/src/external_aom/
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/aom
-      ${AOM_CMAKE_FLAGS}
-      ${AOM_EXTRA_ARGS}
-      ${BUILD_DIR}/aom/src/external_aom/
-
   BUILD_COMMAND ${CMAKE_COMMAND} --build .
   INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
   INSTALL_DIR ${LIBDIR}/aom

build_files/build_environment/cmake/blosc.cmake

@@ -26,12 +26,7 @@ ExternalProject_Add(external_blosc
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${BLOSC_HASH_TYPE}=${BLOSC_HASH}
   PREFIX ${BUILD_DIR}/blosc
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc
-    ${DEFAULT_CMAKE_FLAGS}
-    ${BLOSC_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/blosc
 )
 

build_files/build_environment/cmake/boost.cmake

@@ -16,29 +16,14 @@ if(WIN32)
   else()
     list(APPEND BOOST_BUILD_OPTIONS variant=release)
   endif()
-  set(BOOST_HARVEST_CMD
+  set(BOOST_HARVEST_CMD ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/)
-    ${CMAKE_COMMAND} -E copy_directory
-      ${LIBDIR}/boost/lib/
-      ${HARVEST_TARGET}/boost/lib/
-    )
   if(BUILD_MODE STREQUAL Release)
-    set(BOOST_HARVEST_CMD
+    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-${BOOST_VERSION_NODOTS_SHORT}/ ${HARVEST_TARGET}/boost/include/)
-      ${BOOST_HARVEST_CMD} &&
-      ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/boost/include/boost-${BOOST_VERSION_NODOTS_SHORT}/
-        ${HARVEST_TARGET}/boost/include/
-    )
   endif()
 elseif(APPLE)
   set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
   set(BOOST_BUILD_COMMAND ./b2)
-  set(BOOST_BUILD_OPTIONS
+  set(BOOST_BUILD_OPTIONS toolset=clang-darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off)
-    toolset=clang-darwin
-    cxxflags=${PLATFORM_CXXFLAGS}
-    linkflags=${PLATFORM_LDFLAGS}
-    visibility=global
-    --disable-icu boost.locale.icu=off
-  )
   set(BOOST_HARVEST_CMD echo .)
 else()
   set(BOOST_HARVEST_CMD echo .)
@@ -87,25 +72,9 @@ ExternalProject_Add(external_boost
   URL_HASH ${BOOST_HASH_TYPE}=${BOOST_HASH}
   PREFIX ${BUILD_DIR}/boost
   UPDATE_COMMAND  ""
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/boost/src/external_boost < ${PATCH_DIR}/boost.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/boost/src/external_boost <
-    ${PATCH_DIR}/boost.diff
-
   CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
-
+  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=${BOOST_ARCHITECTURE} address-model=${BOOST_ADDRESS_MODEL} link=shared threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
-  BUILD_COMMAND
-    ${BOOST_BUILD_COMMAND}
-      ${BOOST_BUILD_OPTIONS}
-      -j${MAKE_THREADS}
-      architecture=${BOOST_ARCHITECTURE}
-      address-model=${BOOST_ADDRESS_MODEL}
-      link=shared
-      threading=multi
-      ${BOOST_OPTIONS}
-      --prefix=${LIBDIR}/boost
-      install
-
   BUILD_IN_SOURCE 1
   INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )

build_files/build_environment/cmake/brotli.cmake

@@ -10,27 +10,15 @@ ExternalProject_Add(external_brotli
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${BROTLI_HASH_TYPE}=${BROTLI_HASH}
   PREFIX ${BUILD_DIR}/brotli
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/brotli ${DEFAULT_CMAKE_FLAGS} ${BROTLI_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/brotli
-    ${DEFAULT_CMAKE_FLAGS}
-    ${BROTLI_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/brotli
 )
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_brotli after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/brotli/include ${HARVEST_TARGET}/brotli/include
-      ${LIBDIR}/brotli/include
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/brotli/lib/brotlidec-static${LIBEXT} ${HARVEST_TARGET}/brotli/lib/brotlidec-static${LIBEXT}
-      ${HARVEST_TARGET}/brotli/include
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/brotli/lib/brotlicommon-static${LIBEXT} ${HARVEST_TARGET}/brotli/lib/brotlicommon-static${LIBEXT}
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/brotli/lib/brotlidec-static${LIBEXT}
-      ${HARVEST_TARGET}/brotli/lib/brotlidec-static${LIBEXT}
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/brotli/lib/brotlicommon-static${LIBEXT}
-      ${HARVEST_TARGET}/brotli/lib/brotlicommon-static${LIBEXT}
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/bzip2.cmake

@@ -9,12 +9,8 @@ set(BZIP2_CONFIGURATION_ARGS)
 if(UNIX AND NOT APPLE)
   set(BZIP2_LDFLAGS "-Wl,--as-needed")
   set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
-  set(BZIP2_CONFIGURE_ENV
+  set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
-    ${BZIP2_CONFIGURE_ENV} &&
+    && export PREFIX=${BZIP2_PREFIX})
-    export LDFLAGS=${BZIP2_LDFLAGS} &&
-    export CFLAGS=${BZIP2_CFLAGS} &&
-    export PREFIX=${BZIP2_PREFIX}
-  )
 else()
   set(BZIP2_CONFIGURE_ENV ${CONFIGURE_ENV})
 endif()
@@ -25,14 +21,7 @@ ExternalProject_Add(external_bzip2
   URL_HASH ${BZIP2_HASH_TYPE}=${BZIP2_HASH}
   PREFIX ${BUILD_DIR}/bzip2
   CONFIGURE_COMMAND echo .
-
+  BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}
-  BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} &&
+  INSTALL_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} PREFIX=${BZIP2_PREFIX} install
-    cd ${BUILD_DIR}/bzip2/src/external_bzip2/ &&
-    make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${BZIP2_CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/bzip2/src/external_bzip2/ &&
-    make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} PREFIX=${BZIP2_PREFIX} install
-
   INSTALL_DIR ${LIBDIR}/bzip2
 )

build_files/build_environment/cmake/deflate.cmake

@@ -13,11 +13,6 @@ ExternalProject_Add(external_deflate
   URL_HASH ${DEFLATE_HASH_TYPE}=${DEFLATE_HASH}
   PREFIX ${BUILD_DIR}/deflate
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/deflate ${DEFAULT_CMAKE_FLAGS} ${DEFLATE_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/deflate
-    ${DEFAULT_CMAKE_FLAGS}
-    ${DEFLATE_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/deflate
 )

build_files/build_environment/cmake/download.cmake

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ## Update and uncomment this in the release branch
-# set(BLENDER_VERSION 3.1)
+set(BLENDER_VERSION 4.1)
 
 function(download_source dep)
   set(TARGET_FILE ${${dep}_FILE})

build_files/build_environment/cmake/dpcpp.cmake

@@ -89,23 +89,14 @@ ExternalProject_Add(external_dpcpp
   CMAKE_GENERATOR ${LLVM_GENERATOR}
   SOURCE_SUBDIR llvm
   LIST_SEPARATOR ^^
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp ${DPCPP_CMAKE_FLAGS} ${DPCPP_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp
-    ${DPCPP_CMAKE_FLAGS}
-    ${DPCPP_EXTRA_ARGS}
-
   # CONFIGURE_COMMAND
   #   ${PYTHON_BINARY}
   #   ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/configure.py ${DPCPP_CONFIGURE_ARGS}
   # BUILD_COMMAND
   #   echo "." # ${PYTHON_BINARY} ${BUILD_DIR}/dpcpp/src/external_dpcpp/buildbot/compile.py
   INSTALL_COMMAND ${CMAKE_COMMAND} --build . -- deploy-sycl-toolchain
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/dpcpp/src/external_dpcpp < ${PATCH_DIR}/dpcpp.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/dpcpp/src/external_dpcpp <
-    ${PATCH_DIR}/dpcpp.diff
-
   INSTALL_DIR ${LIBDIR}/dpcpp
 )
 

build_files/build_environment/cmake/embree.cmake

@@ -86,16 +86,8 @@ ExternalProject_Add(external_embree
   URL_HASH ${EMBREE_HASH_TYPE}=${EMBREE_HASH}
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/embree
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${EMBREE_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
-    ${BUILD_DIR}/embree/src/external_embree <
-    ${PATCH_DIR}/embree.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree
-    ${EMBREE_CMAKE_FLAGS}
-    ${EMBREE_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/embree
 )
 
@@ -115,33 +107,17 @@ endif()
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_embree after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree/include ${HARVEST_TARGET}/embree/include
-        ${LIBDIR}/embree/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree/lib ${HARVEST_TARGET}/embree/lib
-        ${HARVEST_TARGET}/embree/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree/share ${HARVEST_TARGET}/embree/share
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/bin/embree4.dll ${HARVEST_TARGET}/embree/bin/embree4.dll
-        ${LIBDIR}/embree/lib
-        ${HARVEST_TARGET}/embree/lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/embree/share
-        ${HARVEST_TARGET}/embree/share
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/embree/bin/embree4.dll
-        ${HARVEST_TARGET}/embree/bin/embree4.dll
-
       DEPENDEES install
     )
   else()
     ExternalProject_Add_Step(external_embree after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/bin/embree4_d.dll ${HARVEST_TARGET}/embree/bin/embree4_d.dll
-        ${LIBDIR}/embree/bin/embree4_d.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree4_d.lib ${HARVEST_TARGET}/embree/lib/embree4_d.lib
-        ${HARVEST_TARGET}/embree/bin/embree4_d.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree4_sycl_d.lib ${HARVEST_TARGET}/embree/lib/embree4_sycl_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/embree/lib/embree4_d.lib
-        ${HARVEST_TARGET}/embree/lib/embree4_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/embree/lib/embree4_sycl_d.lib
-        ${HARVEST_TARGET}/embree/lib/embree4_sycl_d.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/epoxy.cmake

@@ -12,35 +12,17 @@ ExternalProject_Add(external_epoxy
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${EPOXY_HASH_TYPE}=${EPOXY_HASH}
   PREFIX ${BUILD_DIR}/epoxy
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/epoxy/src/external_epoxy/ < ${PATCH_DIR}/epoxy.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${MESON} setup --prefix ${LIBDIR}/epoxy --default-library ${EPOXY_LIB_TYPE} --libdir lib ${BUILD_DIR}/epoxy/src/external_epoxy-build ${BUILD_DIR}/epoxy/src/external_epoxy -Dtests=false ${MESON_BUILD_TYPE}
-    ${BUILD_DIR}/epoxy/src/external_epoxy/ <
-    ${PATCH_DIR}/epoxy.diff
-
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-    ${MESON} setup
-      --prefix ${LIBDIR}/epoxy
-      --default-library ${EPOXY_LIB_TYPE}
-      --libdir lib
-      ${BUILD_DIR}/epoxy/src/external_epoxy-build
-      ${BUILD_DIR}/epoxy/src/external_epoxy
-      -Dtests=false ${MESON_BUILD_TYPE}
-
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_epoxy after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/epoxy/include ${HARVEST_TARGET}/epoxy/include
-      ${LIBDIR}/epoxy/include
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/epoxy/bin/epoxy-0.dll ${HARVEST_TARGET}/epoxy/bin/epoxy-0.dll
-      ${HARVEST_TARGET}/epoxy/include
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/epoxy/lib/epoxy.lib ${HARVEST_TARGET}/epoxy/lib/epoxy.lib
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/epoxy/bin/epoxy-0.dll
-      ${HARVEST_TARGET}/epoxy/bin/epoxy-0.dll
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/epoxy/lib/epoxy.lib
-      ${HARVEST_TARGET}/epoxy/lib/epoxy.lib
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/expat.cmake

@@ -15,12 +15,7 @@ ExternalProject_Add(external_expat
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${EXPAT_HASH_TYPE}=${EXPAT_HASH}
   PREFIX ${BUILD_DIR}/expat
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/expat ${DEFAULT_CMAKE_FLAGS} ${EXPAT_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/expat
-    ${DEFAULT_CMAKE_FLAGS}
-    ${EXPAT_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/expat
   SOURCE_SUBDIR expat
 )

build_files/build_environment/cmake/ffi.cmake

@@ -7,36 +7,20 @@ ExternalProject_Add(external_ffi
   URL_HASH ${FFI_HASH_TYPE}=${FFI_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/ffi
-
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+    --enable-shared=no
-    cd ${BUILD_DIR}/ffi/src/external_ffi/ &&
+    --enable-static=yes
-    ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi
+    --with-pic
-      --enable-shared=no
+    --libdir=${LIBDIR}/ffi/lib/
-      --enable-static=yes
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make -j${MAKE_THREADS}
-      --with-pic
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make install
-      --libdir=${LIBDIR}/ffi/lib/
+  PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ffi/src/external_ffi < ${PATCH_DIR}/ffi.diff
-
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/ffi/src/external_ffi/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/ffi/src/external_ffi/ &&
-    make install
-
-  PATCH_COMMAND ${PATCH_CMD} -p 0 -d
-    ${BUILD_DIR}/ffi/src/external_ffi <
-    ${PATCH_DIR}/ffi.diff
-
   INSTALL_DIR ${LIBDIR}/ffi
 )
 
 if(UNIX AND NOT APPLE)
   ExternalProject_Add_Step(external_ffi after_install
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/ffi/lib/libffi.a ${LIBDIR}/ffi/lib/libffi_pic.a
-      ${LIBDIR}/ffi/lib/libffi.a
-      ${LIBDIR}/ffi/lib/libffi_pic.a
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/ffmpeg.cmake

@@ -149,76 +149,61 @@ ExternalProject_Add(external_ffmpeg
   URL file://${PACKAGE_DIR}/${FFMPEG_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${FFMPEG_HASH_TYPE}=${FFMPEG_HASH}
-
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${FFMPEG_PATCH_FILE}
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d
-    ${BUILD_DIR}/ffmpeg/src/external_ffmpeg <
-    ${FFMPEG_PATCH_FILE}
-
   PREFIX ${BUILD_DIR}/ffmpeg
-
   CONFIGURE_COMMAND ${FFMPEG_CONFIGURE_COMMAND} &&
     cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
     ${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
-      --disable-lzma
+    --disable-lzma
-      --disable-avfilter
+    --disable-avfilter
-      --disable-vdpau
+    --disable-vdpau
-      --disable-bzlib
+    --disable-bzlib
-      --disable-libgsm
+    --disable-libgsm
-      --disable-libspeex
+    --disable-libspeex
-      --enable-libvpx
+    --enable-libvpx
-      --enable-libopus
+    --enable-libopus
-      --prefix=${LIBDIR}/ffmpeg
+    --prefix=${LIBDIR}/ffmpeg
-      --enable-libtheora
+    --enable-libtheora
-      --enable-libvorbis
+    --enable-libvorbis
-      --enable-zlib
+    --enable-zlib
-      --enable-stripping
+    --enable-stripping
-      --enable-runtime-cpudetect
+    --enable-runtime-cpudetect
-      --disable-vaapi
+    --disable-vaapi
-      --disable-nonfree
+    --disable-nonfree
-      --enable-gpl
+    --enable-gpl
-      --disable-postproc
+    --disable-postproc
-      --enable-libmp3lame
+    --enable-libmp3lame
-      --disable-librtmp
+    --disable-librtmp
-      --enable-libx264
+    --enable-libx264
-      --enable-libaom
+    --enable-libaom
-      --disable-libopencore-amrnb
+    --disable-libopencore-amrnb
-      --disable-libopencore-amrwb
+    --disable-libopencore-amrwb
-      --disable-libdc1394
+    --disable-libdc1394
-      --disable-version3
+    --disable-version3
-      --disable-debug
+    --disable-debug
-      --enable-optimizations
+    --enable-optimizations
-      --enable-ffplay
+    --enable-ffplay
-      --disable-openssl
+    --disable-openssl
-      --disable-securetransport
+    --disable-securetransport
-      --disable-indev=avfoundation
+    --disable-indev=avfoundation
-      --disable-indev=qtkit
+    --disable-indev=qtkit
-      --disable-sdl2
+    --disable-sdl2
-      --disable-gnutls
+    --disable-gnutls
-      --disable-videotoolbox
+    --disable-videotoolbox
-      --disable-libxcb
+    --disable-libxcb
-      --disable-xlib
+    --disable-xlib
-      --disable-audiotoolbox
+    --disable-audiotoolbox
-      --disable-cuvid
+    --disable-cuvid
-      --disable-nvenc
+    --disable-nvenc
-      --disable-indev=jack
+    --disable-indev=jack
-      --disable-indev=alsa
+    --disable-indev=alsa
-      --disable-outdev=alsa
+    --disable-outdev=alsa
-      --disable-crystalhd
+    --disable-crystalhd
-      --disable-sndio
+    --disable-sndio
-      --disable-doc
+    --disable-doc
-
+  BUILD_COMMAND ${FFMPEG_CONFIGURE_COMMAND} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
-  BUILD_COMMAND ${FFMPEG_CONFIGURE_COMMAND} &&
+  INSTALL_COMMAND ${FFMPEG_CONFIGURE_COMMAND} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
-    cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${FFMPEG_CONFIGURE_COMMAND} &&
-    cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
-    make install
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg
-    ${DEFAULT_CMAKE_FLAGS}
-
   INSTALL_DIR ${LIBDIR}/ffmpeg
 )
 
@@ -257,13 +242,8 @@ endif()
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_ffmpeg after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include
-      ${LIBDIR}/ffmpeg/include
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
-      ${HARVEST_TARGET}/ffmpeg/include
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-      ${LIBDIR}/ffmpeg/bin
-      ${HARVEST_TARGET}/ffmpeg/lib
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/fftw.cmake

@@ -15,11 +15,7 @@ macro(fftw_build FFTW_POSTFIX)
       DOWNLOAD_DIR ${DOWNLOAD_DIR}
       URL_HASH ${FFTW_HASH_TYPE}=${FFTW_HASH}
       PREFIX ${BUILD_DIR}/fftw3
-
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/fftw3 ${FFTW_EXTRA_ARGS}
-      CMAKE_ARGS
-        -DCMAKE_INSTALL_PREFIX=${LIBDIR}/fftw3
-        ${FFTW_EXTRA_ARGS}
-
       INSTALL_DIR ${LIBDIR}/fftw3
     )
   else()
@@ -30,19 +26,9 @@ macro(fftw_build FFTW_POSTFIX)
       DOWNLOAD_DIR ${DOWNLOAD_DIR}
       URL_HASH ${FFTW_HASH_TYPE}=${FFTW_HASH}
       PREFIX ${BUILD_DIR}/fftw3
-
+      CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3_${FFTW_POSTFIX}/ && ${CONFIGURE_COMMAND} ${FFTW_EXTRA_ARGS} ${ARGN} --prefix=${mingw_LIBDIR}/fftw3
-      CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+      BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3_${FFTW_POSTFIX}/ && make -j${MAKE_THREADS}
-        cd ${BUILD_DIR}/fftw3/src/external_fftw3_${FFTW_POSTFIX}/ &&
+      INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3_${FFTW_POSTFIX}/ && make ${FFTW_INSTALL}
-        ${CONFIGURE_COMMAND} ${FFTW_EXTRA_ARGS} ${ARGN} --prefix=${mingw_LIBDIR}/fftw3
-
-      BUILD_COMMAND ${CONFIGURE_ENV} &&
-        cd ${BUILD_DIR}/fftw3/src/external_fftw3_${FFTW_POSTFIX}/ &&
-        make -j${MAKE_THREADS}
-
-      INSTALL_COMMAND ${CONFIGURE_ENV} &&
-        cd ${BUILD_DIR}/fftw3/src/external_fftw3_${FFTW_POSTFIX}/ &&
-        make ${FFTW_INSTALL}
-
       INSTALL_DIR ${LIBDIR}/fftw3
     )
   endif()
@@ -54,24 +40,14 @@ fftw_build(float --enable-float)
 if(MSVC)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_fftw3_double after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/fftw3.lib ${HARVEST_TARGET}/fftw3/lib/fftw3.lib
-        ${LIBDIR}/fftw3/lib/fftw3.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/bin/fftw3.dll ${HARVEST_TARGET}/fftw3/lib/fftw3.dll
-        ${HARVEST_TARGET}/fftw3/lib/fftw3.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/fftw3/bin/fftw3.dll
-        ${HARVEST_TARGET}/fftw3/lib/fftw3.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/fftw3/include/fftw3.h
-        ${HARVEST_TARGET}/fftw3/include/fftw3.h
       DEPENDEES install
     )
     ExternalProject_Add_Step(external_fftw3_float after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/fftw3f.lib ${HARVEST_TARGET}/fftw3/lib/fftw3f.lib
-        ${LIBDIR}/fftw3/lib/fftw3f.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/bin/fftw3f.dll ${HARVEST_TARGET}/fftw3/lib/fftw3f.dll
-        ${HARVEST_TARGET}/fftw3/lib/fftw3f.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/fftw3/bin/fftw3f.dll
-        ${HARVEST_TARGET}/fftw3/lib/fftw3f.dll
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/flac.cmake

@@ -8,19 +8,9 @@ if(NOT WIN32)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${FLAC_HASH_TYPE}=${FLAC_HASH}
     PREFIX ${BUILD_DIR}/flac
-
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make -j${MAKE_THREADS}
-      cd ${BUILD_DIR}/flac/src/external_flac/ &&
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make install
-      ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
-
-    BUILD_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/flac/src/external_flac/ &&
-      make -j${MAKE_THREADS}
-
-    INSTALL_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/flac/src/external_flac/ &&
-      make install
-
     INSTALL_DIR ${LIBDIR}/flac
   )
 else()
@@ -44,12 +34,7 @@ else()
     URL_HASH ${FLAC_HASH_TYPE}=${FLAC_HASH}
     PREFIX ${BUILD_DIR}/flac
     CMAKE_GENERATOR "Ninja"
-
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flac ${DEFAULT_CMAKE_FLAGS} ${FLAC_EXTRA_ARGS}
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flac
-      ${DEFAULT_CMAKE_FLAGS}
-      ${FLAC_EXTRA_ARGS}
-
     INSTALL_DIR ${LIBDIR}/flac
   )
 endif()

build_files/build_environment/cmake/flex.cmake

@@ -15,19 +15,9 @@ ExternalProject_Add(external_flex
   URL_HASH ${FLEX_HASH_TYPE}=${FLEX_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/flex
-
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && ${_autoconf_cmd_optional} ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flex
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make -j${MAKE_THREADS}
-    cd ${BUILD_DIR}/flex/src/external_flex/ &&
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make install
-    ${_autoconf_cmd_optional} ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flex
-
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/flex/src/external_flex/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/flex/src/external_flex/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/flex
 )
 

build_files/build_environment/cmake/flexbison.cmake

@@ -9,19 +9,9 @@ ExternalProject_Add(external_flexbison
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${FLEXBISON_HASH_TYPE}=${FLEXBISON_HASH}
   PREFIX ${BUILD_DIR}/flexbison
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison ${DEFAULT_CMAKE_FLAGS} ${FLEXBISON_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison
-    ${DEFAULT_CMAKE_FLAGS}
-    ${FLEXBISON_EXTRA_ARGS}
-
   CONFIGURE_COMMAND echo .
   BUILD_COMMAND echo .
-
+  INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/flexbison/src/external_flexbison/ ${LIBDIR}/flexbison/
-  INSTALL_COMMAND
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-      ${BUILD_DIR}/flexbison/src/external_flexbison/
-      ${LIBDIR}/flexbison/
-
   INSTALL_DIR ${LIBDIR}/flexbison
 )

build_files/build_environment/cmake/fmt.cmake

@@ -12,11 +12,6 @@ ExternalProject_Add(external_fmt
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${FMT_HASH_TYPE}=${FMT_HASH}
   PREFIX ${BUILD_DIR}/fmt
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/fmt ${DEFAULT_CMAKE_FLAGS} ${FMT_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/fmt
-    ${DEFAULT_CMAKE_FLAGS}
-    ${FMT_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/fmt
 )

build_files/build_environment/cmake/freetype.cmake

@@ -21,12 +21,7 @@ ExternalProject_Add(external_freetype
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${FREETYPE_HASH_TYPE}=${FREETYPE_HASH}
   PREFIX ${BUILD_DIR}/freetype
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype
-    ${DEFAULT_CMAKE_FLAGS}
-    ${FREETYPE_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/freetype
 )
 
@@ -38,15 +33,10 @@ add_dependencies(
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_freetype after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
-      ${LIBDIR}/freetype
+    # harfbuzz *NEEDS* to find freetype.lib and will not be conviced to take alternative names so just give it
-      ${HARVEST_TARGET}/freetype
+    # what it wants.
-
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/freetype/lib/freetype2st.lib ${LIBDIR}/freetype/lib/freetype.lib
-    # `harfbuzz` *NEEDS* to find `freetype.lib` and will not be convinced to take
-    # alternative names so just give it what it wants.
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/freetype/lib/freetype2st.lib
-      ${LIBDIR}/freetype/lib/freetype.lib
 
     DEPENDEES install
   )

build_files/build_environment/cmake/fribidi.cmake

@@ -11,17 +11,7 @@ ExternalProject_Add(external_fribidi
   URL_HASH ${FRIBIDI_HASH_TYPE}=${FRIBIDI_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/fribidi
-
+  CONFIGURE_COMMAND ${MESON} setup --prefix ${LIBDIR}/fribidi ${MESON_BUILD_TYPE} -Ddocs=false --default-library static --libdir lib ${BUILD_DIR}/fribidi/src/external_fribidi-build ${BUILD_DIR}/fribidi/src/external_fribidi
-  CONFIGURE_COMMAND
-    ${MESON} setup
-      --prefix ${LIBDIR}/fribidi
-      ${MESON_BUILD_TYPE}
-      -Ddocs=false
-      --default-library static
-      --libdir lib
-      ${BUILD_DIR}/fribidi/src/external_fribidi-build
-      ${BUILD_DIR}/fribidi/src/external_fribidi
-
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
   INSTALL_DIR ${LIBDIR}/fribidi
@@ -36,13 +26,8 @@ add_dependencies(
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_fribidi after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/fribidi/include ${HARVEST_TARGET}/fribidi/include
-      ${LIBDIR}/fribidi/include
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fribidi/lib/libfribidi.a ${HARVEST_TARGET}/fribidi/lib/libfribidi.lib
-      ${HARVEST_TARGET}/fribidi/include
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/fribidi/lib/libfribidi.a
-      ${HARVEST_TARGET}/fribidi/lib/libfribidi.lib
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/gmmlib.cmake

@@ -10,11 +10,6 @@ ExternalProject_Add(external_gmmlib
   URL_HASH ${GMMLIB_HASH_TYPE}=${GMMLIB_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/gmmlib
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmmlib ${DEFAULT_CMAKE_FLAGS} ${GMMLIB_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmmlib
-    ${DEFAULT_CMAKE_FLAGS}
-    ${GMMLIB_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/gmmlib
 )

build_files/build_environment/cmake/gmp.cmake

@@ -12,42 +12,14 @@ if(WIN32)
   set(GMP_CC_CXX "${compilescript_path} cl")
   set(GMP_NM "dumpbin.exe -symbols -headers")
 
-  set(GMP_CONFIGURE_ENV
+  set(GMP_CONFIGURE_ENV set AR=${arlib_joint_path} && set NM=${GMP_NM} && ${CONFIGURE_ENV_NO_PERL} && set CC=${GMP_CC_CXX} && set CXX=${GMP_CC_CXX} && set CFLAGS=${GMP_CFLAGS} && set AS=:)
-    set AR=${arlib_joint_path} &&
-    set NM=${GMP_NM} &&
-    ${CONFIGURE_ENV_NO_PERL} &&
-    set CC=${GMP_CC_CXX} &&
-    set CXX=${GMP_CC_CXX} &&
-    set CFLAGS=${GMP_CFLAGS} &&
-    set AS=:
-  )
 
-  set(GMP_OPTIONS
+  set(GMP_OPTIONS --disable-static --enable-shared --enable-cxx --verbose gmp_cv_check_libm_for_build=no ac_cv_prog_LEX=: ac_cv_prog_YACC=: ac_cv_prog_ac_ct_STRIP=: ac_cv_prog_RANLIB=:)
-    --disable-static
-    --enable-shared
-    --enable-cxx
-    --verbose
-    gmp_cv_check_libm_for_build=no
-    ac_cv_prog_LEX=:
-    ac_cv_prog_YACC=:
-    ac_cv_prog_ac_ct_STRIP=:
-    ac_cv_prog_RANLIB=:
-  )
 
   if(BLENDER_PLATFORM_ARM)
-    set(GMP_OPTIONS
+    set(GMP_OPTIONS ${GMP_OPTIONS} --enable-assembly=no --build=aarch64-pc-mingw32)
-      ${GMP_OPTIONS}
-      --enable-assembly=no
-      --build=aarch64-pc-mingw32
-    )
   else()
-    set(GMP_OPTIONS
+    set(GMP_OPTIONS ${GMP_OPTIONS} --enable-assembly=no --build=x86_64-pc-mingw32 ac_cv_func_memset=yes gmp_cv_asm_w32=.word)
-      ${GMP_OPTIONS}
-      --enable-assembly=no
-      --build=x86_64-pc-mingw32
-      ac_cv_func_memset=yes
-      gmp_cv_asm_w32=.word
-    )
   endif()
 else()
   set(GMP_CONFIGURE_ENV ${CONFIGURE_ENV_NO_PERL})
@@ -80,39 +52,18 @@ ExternalProject_Add(external_gmp
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
   PREFIX ${BUILD_DIR}/gmp
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/gmp/src/external_gmp < ${PATCH_DIR}/gmp.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
+  CONFIGURE_COMMAND ${GMP_CONFIGURE_ENV} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/gmp ${GMP_OPTIONS} ${GMP_EXTRA_ARGS}
-    ${BUILD_DIR}/gmp/src/external_gmp <
+  BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && make -j${MAKE_THREADS}
-    ${PATCH_DIR}/gmp.diff
+  INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/gmp/src/external_gmp/ && make install
-
-  CONFIGURE_COMMAND ${GMP_CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/gmp/src/external_gmp/ &&
-    ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/gmp ${GMP_OPTIONS} ${GMP_EXTRA_ARGS}
-
-  BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
-    cd ${BUILD_DIR}/gmp/src/external_gmp/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
-    cd ${BUILD_DIR}/gmp/src/external_gmp/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/gmp
 )
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_gmp after_install
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/bin/gmp-10.dll ${HARVEST_TARGET}/gmp/lib/gmp-10.dll
-      ${LIBDIR}/gmp/bin/gmp-10.dll
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/gmp/lib/gmp.dll.lib ${HARVEST_TARGET}/gmp/lib/gmp.dll.lib
-      ${HARVEST_TARGET}/gmp/lib/gmp-10.dll
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmp/include ${HARVEST_TARGET}/gmp/include
-
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/gmp/lib/gmp.dll.lib
-      ${HARVEST_TARGET}/gmp/lib/gmp.dll.lib
-
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-      ${LIBDIR}/gmp/include
-      ${HARVEST_TARGET}/gmp/include
 
     DEPENDEES install
   )
@@ -127,22 +78,9 @@ if(WIN32)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${GMP_HASH_TYPE}=${GMP_HASH}
     PREFIX ${BUILD_DIR}/gmpxx
-
+    PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_gmpxx.txt ${BUILD_DIR}/gmpxx/src/external_gmpxx/CMakeLists.txt &&
-    PATCH_COMMAND COMMAND
+                          ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/config_gmpxx.h ${BUILD_DIR}/gmpxx/src/external_gmpxx/config.h
-      ${CMAKE_COMMAND} -E copy
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmpxx ${DEFAULT_CMAKE_FLAGS} -DGMP_LIBRARY=${BUILD_DIR}/gmp/src/external_gmp/.libs/gmp.dll.lib -DGMP_INCLUDE_DIR=${BUILD_DIR}/gmp/src/external_gmp -DCMAKE_DEBUG_POSTFIX=_d
-        ${PATCH_DIR}/cmakelists_gmpxx.txt
-        ${BUILD_DIR}/gmpxx/src/external_gmpxx/CMakeLists.txt &&
-      ${CMAKE_COMMAND} -E copy
-      ${PATCH_DIR}/config_gmpxx.h
-      ${BUILD_DIR}/gmpxx/src/external_gmpxx/config.h
-
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/gmpxx
-      ${DEFAULT_CMAKE_FLAGS}
-      -DGMP_LIBRARY=${BUILD_DIR}/gmp/src/external_gmp/.libs/gmp.dll.lib
-      -DGMP_INCLUDE_DIR=${BUILD_DIR}/gmp/src/external_gmp
-      -DCMAKE_DEBUG_POSTFIX=_d
-
     INSTALL_DIR ${LIBDIR}/gmpxx
   )
 
@@ -152,10 +90,7 @@ if(WIN32)
   )
 
   ExternalProject_Add_Step(external_gmpxx after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/gmpxx/ ${HARVEST_TARGET}/gmp
-        ${LIBDIR}/gmpxx/
-        ${HARVEST_TARGET}/gmp
-
     DEPENDEES install
   )
 

build_files/build_environment/cmake/harfbuzz.cmake

@@ -33,12 +33,13 @@ ExternalProject_Add(external_harfbuzz
   PREFIX ${BUILD_DIR}/harfbuzz
 
   CONFIGURE_COMMAND ${HARFBUZZ_CONFIGURE_ENV} &&
-    ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV} ${MESON} setup
+  ${CMAKE_COMMAND} -E env ${HARFBUZZ_PKG_ENV}
-      --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS}
+  ${MESON} setup
-      --default-library static
+  --prefix ${LIBDIR}/harfbuzz ${HARFBUZZ_EXTRA_OPTIONS}
-      --libdir lib
+  --default-library static
-      ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build
+  --libdir lib
-      ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
+  ${BUILD_DIR}/harfbuzz/src/external_harfbuzz-build
+  ${BUILD_DIR}/harfbuzz/src/external_harfbuzz
 
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
@@ -55,22 +56,16 @@ add_dependencies(
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_harfbuzz after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/harfbuzz/include ${HARVEST_TARGET}/harfbuzz/include
-      ${LIBDIR}/harfbuzz/include
-      ${HARVEST_TARGET}/harfbuzz/include
     # We do not use the subset API currently, so copying only the main library will suffice for now
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/harfbuzz/lib/libharfbuzz.a ${HARVEST_TARGET}/harfbuzz/lib/libharfbuzz.lib
-      ${LIBDIR}/harfbuzz/lib/libharfbuzz.a
-      ${HARVEST_TARGET}/harfbuzz/lib/libharfbuzz.lib
     DEPENDEES install
   )
 endif()
 
 if(BUILD_MODE STREQUAL Debug AND WIN32)
   ExternalProject_Add_Step(external_harfbuzz after_install
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/harfbuzz/lib/libharfbuzz.a ${HARVEST_TARGET}/harfbuzz/lib/libharfbuzz_d.lib
-      ${LIBDIR}/harfbuzz/lib/libharfbuzz.a
-      ${HARVEST_TARGET}/harfbuzz/lib/libharfbuzz_d.lib
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/haru.cmake

@@ -14,28 +14,18 @@ ExternalProject_Add(external_haru
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${HARU_HASH_TYPE}=${HARU_HASH}
   PREFIX ${BUILD_DIR}/haru
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/haru/src/external_haru < ${PATCH_DIR}/haru.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/haru/src/external_haru <
-    ${PATCH_DIR}/haru.diff
-
   CMAKE_ARGS
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/haru
     ${DEFAULT_CMAKE_FLAGS} ${HARU_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/haru
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_haru after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/haru/include ${HARVEST_TARGET}/haru/include
-        ${LIBDIR}/haru/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/haru/lib/libhpdfs.lib ${HARVEST_TARGET}/haru/lib/libhpdfs.lib
-        ${HARVEST_TARGET}/haru/include
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/haru/lib/libhpdfs.lib
-        ${HARVEST_TARGET}/haru/lib/libhpdfs.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/harvest.cmake

@@ -16,21 +16,11 @@ if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     add_custom_target(Harvest_Release_Results
       COMMAND # JPEG rename lib-file + copy include.
-      ${CMAKE_COMMAND} -E copy
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-        ${LIBDIR}/jpeg/lib/jpeg-static.lib
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpeg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
-        ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-      ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/jpeg/include/
-        ${HARVEST_TARGET}/jpeg/include/ &&
-
       # PNG.
-      ${CMAKE_COMMAND} -E copy
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
-        ${LIBDIR}/png/lib/libpng16_static.lib
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
-        ${HARVEST_TARGET}/png/lib/libpng.lib &&
-      ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/png/include/
-        ${HARVEST_TARGET}/png/include/ &&
-
       DEPENDS
     )
   endif()

build_files/build_environment/cmake/iconv.cmake

@@ -9,19 +9,9 @@ ExternalProject_Add(external_iconv
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${ICONV_HASH_TYPE}=${ICONV_HASH}
   PREFIX ${BUILD_DIR}/iconv
-
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}
-    cd ${BUILD_DIR}/iconv/src/external_iconv/ &&
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make install
-    ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
-
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/iconv/src/external_iconv/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/iconv/src/external_iconv/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/iconv
 )
 
@@ -29,12 +19,8 @@ if(MSVC)
   set_target_properties(external_iconv PROPERTIES FOLDER Mingw)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_iconv after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib
-        ${LIBDIR}/iconv/lib/libiconv.a
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h
-        ${HARVEST_TARGET}/iconv/lib/iconv.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/iconv/include/iconv.h
-        ${HARVEST_TARGET}/iconv/include/iconv.h
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/igc.cmake

@@ -21,10 +21,7 @@ ExternalProject_Add(external_igc_opencl_clang
   CONFIGURE_COMMAND echo .
   BUILD_COMMAND echo .
   INSTALL_COMMAND echo .
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/ < ${PATCH_DIR}/igc_opencl_clang.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/ <
-    ${PATCH_DIR}/igc_opencl_clang.diff
 )
 
 set(IGC_OPENCL_CLANG_PATCH_DIR ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/patches)
@@ -39,26 +36,12 @@ ExternalProject_Add(external_igc_llvm
   CONFIGURE_COMMAND echo .
   BUILD_COMMAND echo .
   INSTALL_COMMAND echo .
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch &&
-  PATCH_COMMAND
+    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0002-Remove-wrong-check-of-__opencl_c_images-feature-macr.patch &&
-    ${PATCH_CMD} -p 1 -d
+    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0003-Fix-checking-mechanism-for-read_write-Image-type.patch &&
-      ${IGC_LLVM_SOURCE_DIR} <
+    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0004-OpenCL-Allow-undefining-header-only-macros.patch &&
-      ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0001-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch &&
+    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0005-Enable-use-of-GNU-C-extension.patch &&
-    ${PATCH_CMD} -p 1 -d
+    ${PATCH_CMD} -p 1 -d ${IGC_LLVM_SOURCE_DIR} < ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0006-Make-globals-used-for-array-initialization-codegen-c.patch
-      ${IGC_LLVM_SOURCE_DIR} <
-      ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0002-Remove-wrong-check-of-__opencl_c_images-feature-macr.patch &&
-    ${PATCH_CMD} -p 1 -d
-      ${IGC_LLVM_SOURCE_DIR} <
-      ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0003-Fix-checking-mechanism-for-read_write-Image-type.patch &&
-    ${PATCH_CMD} -p 1 -d
-      ${IGC_LLVM_SOURCE_DIR} <
-      ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0004-OpenCL-Allow-undefining-header-only-macros.patch &&
-    ${PATCH_CMD} -p 1 -d
-      ${IGC_LLVM_SOURCE_DIR} <
-      ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0005-Enable-use-of-GNU-C-extension.patch &&
-    ${PATCH_CMD} -p 1 -d
-      ${IGC_LLVM_SOURCE_DIR} <
-      ${IGC_OPENCL_CLANG_PATCH_DIR}/clang/0006-Make-globals-used-for-array-initialization-codegen-c.patch
 )
 add_dependencies(
   external_igc_llvm
@@ -103,36 +86,19 @@ ExternalProject_Add(external_igc
   URL file://${PACKAGE_DIR}/${IGC_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${IGC_HASH_TYPE}=${IGC_HASH}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/igc ${DEFAULT_CMAKE_FLAGS} ${IGC_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/igc
-    ${DEFAULT_CMAKE_FLAGS}
-    ${IGC_EXTRA_ARGS}
 
   # IGC is pretty set in its way where sub projects ought to live, for some it offers
-  # hooks to supply alternatives folders, other are just hard-coded with no way to configure
+  # hooks to supply alternatives folders, other are just hardocded with no way to configure
   # we symlink everything here, since it's less work than trying to convince the cmake
   # scripts to accept alternative locations.
-  PATCH_COMMAND
+  #
-    ${CMAKE_COMMAND} -E create_symlink
+  PATCH_COMMAND ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_llvm/src/external_igc_llvm/ ${BUILD_DIR}/igc/src/llvm-project &&
-      ${BUILD_DIR}/igc_llvm/src/external_igc_llvm/
+    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/ ${BUILD_DIR}/igc/src/llvm-project/llvm/projects/opencl-clang &&
-      ${BUILD_DIR}/igc/src/llvm-project &&
+    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_translator/src/external_igc_spirv_translator/ ${BUILD_DIR}/igc/src/llvm-project/llvm/projects/llvm-spirv &&
-    ${CMAKE_COMMAND} -E create_symlink
+    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_tools/src/external_igc_spirv_tools/ ${BUILD_DIR}/igc/src/SPIRV-Tools &&
-      ${BUILD_DIR}/igc_opencl_clang/src/external_igc_opencl_clang/
+    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_spirv_headers/src/external_igc_spirv_headers/ ${BUILD_DIR}/igc/src/SPIRV-Headers &&
-      ${BUILD_DIR}/igc/src/llvm-project/llvm/projects/opencl-clang &&
+    ${CMAKE_COMMAND} -E create_symlink ${BUILD_DIR}/igc_vcintrinsics/src/external_igc_vcintrinsics/ ${BUILD_DIR}/igc/src/vc-intrinsics
-    ${CMAKE_COMMAND} -E create_symlink
-      ${BUILD_DIR}/igc_spirv_translator/src/external_igc_spirv_translator/
-      ${BUILD_DIR}/igc/src/llvm-project/llvm/projects/llvm-spirv &&
-    ${CMAKE_COMMAND} -E create_symlink
-      ${BUILD_DIR}/igc_spirv_tools/src/external_igc_spirv_tools/
-      ${BUILD_DIR}/igc/src/SPIRV-Tools &&
-    ${CMAKE_COMMAND} -E create_symlink
-      ${BUILD_DIR}/igc_spirv_headers/src/external_igc_spirv_headers/
-      ${BUILD_DIR}/igc/src/SPIRV-Headers &&
-    ${CMAKE_COMMAND} -E create_symlink
-      ${BUILD_DIR}/igc_vcintrinsics/src/external_igc_vcintrinsics/
-      ${BUILD_DIR}/igc/src/vc-intrinsics
-
   PREFIX ${BUILD_DIR}/igc
   INSTALL_DIR ${LIBDIR}/igc
   INSTALL_COMMAND ${CMAKE_COMMAND} --install . --strip

build_files/build_environment/cmake/imath.cmake

@@ -14,31 +14,16 @@ ExternalProject_Add(external_imath
   URL_HASH ${IMATH_HASH_TYPE}=${IMATH_HASH}
   PREFIX ${BUILD_DIR}/imath
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/imath ${DEFAULT_CMAKE_FLAGS} ${IMATH_EXTRA_ARGS}
-  CMAKE_ARGS
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/imath/src/external_imath < ${PATCH_DIR}/imath_358.diff
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/imath
-    ${DEFAULT_CMAKE_FLAGS}
-    ${IMATH_EXTRA_ARGS}
-
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/imath/src/external_imath <
-    ${PATCH_DIR}/imath_358.diff
-
   INSTALL_DIR ${LIBDIR}/imath
 )
 
 if(WIN32)
   ExternalProject_Add_Step(external_imath after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/lib ${HARVEST_TARGET}/imath/lib
-      ${LIBDIR}/imath/lib
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/imath/include ${HARVEST_TARGET}/imath/include
-      ${HARVEST_TARGET}/imath/lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/imath/bin/imath${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/imath/bin/imath${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-      ${LIBDIR}/imath/include
-      ${HARVEST_TARGET}/imath/include
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/imath/bin/imath${OPENEXR_VERSION_POSTFIX}.dll
-      ${HARVEST_TARGET}/imath/bin/imath${OPENEXR_VERSION_POSTFIX}.dll
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/ispc.cmake

@@ -60,18 +60,8 @@ ExternalProject_Add(external_ispc
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${ISPC_HASH_TYPE}=${ISPC_HASH}
   PREFIX ${BUILD_DIR}/ispc
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ispc/src/external_ispc < ${PATCH_DIR}/ispc.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ISPC_EXTRA_ARGS} ${BUILD_DIR}/ispc/src/external_ispc
-    ${BUILD_DIR}/ispc/src/external_ispc <
-    ${PATCH_DIR}/ispc.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ispc
-    -Wno-dev
-    ${DEFAULT_CMAKE_FLAGS}
-    ${ISPC_EXTRA_ARGS}
-    ${BUILD_DIR}/ispc/src/external_ispc
-
   INSTALL_DIR ${LIBDIR}/ispc
 )
 

build_files/build_environment/cmake/jemalloc.cmake

@@ -7,18 +7,8 @@ ExternalProject_Add(external_jemalloc
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${JEMALLOC_HASH_TYPE}=${JEMALLOC_HASH}
   PREFIX ${BUILD_DIR}/jemalloc
-
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make -j${MAKE_THREADS}
-    cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ &&
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make install
-    ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
-
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/jemalloc
 )

build_files/build_environment/cmake/jpeg.cmake

@@ -30,10 +30,7 @@ if(WIN32)
 
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_jpeg after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}  ${LIBDIR}/jpeg/lib/jpeg${LIBEXT}
-        ${LIBDIR}/jpeg/lib/${JPEG_LIBRARY}
-        ${LIBDIR}/jpeg/lib/jpeg${LIBEXT}
-
       DEPENDEES install
     )
   endif()
@@ -51,12 +48,7 @@ else()
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH}
     PREFIX ${BUILD_DIR}/jpeg
-
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpeg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpeg
-      ${DEFAULT_CMAKE_FLAGS}
-      ${JPEG_EXTRA_ARGS}
-
     INSTALL_DIR ${LIBDIR}/jpeg
   )
 

build_files/build_environment/cmake/lame.cmake

@@ -5,45 +5,23 @@
 set(LAME_EXTRA_ARGS)
 if(MSVC)
   set(LAME_ARCH Win64)
-  set(LAME_CONFIGURE echo .)
+  set (LAME_CONFIGURE echo .)
-  set(LAME_BUILD
+  set (LAME_BUILD cd ${BUILD_DIR}/lame/src/external_lame/ && nmake /F MakeFile.msvc MSVCVER=${LAME_ARCH} all)
-    cd ${BUILD_DIR}/lame/src/external_lame/ &&
+  set (LAME_INSTALL cd ${BUILD_DIR}/lame/src/external_lame/ &&
-    nmake /F MakeFile.msvc MSVCVER=${LAME_ARCH} all
+                      ${CMAKE_COMMAND} -E copy include/lame.h ${LIBDIR}/lame/include/lame/lame.h &&
-  )
+                      ${CMAKE_COMMAND} -E copy output/libmp3lame-static.lib ${LIBDIR}/lame/lib/mp3lame.lib )
-  set(LAME_INSTALL
-    cd ${BUILD_DIR}/lame/src/external_lame/ &&
-    ${CMAKE_COMMAND} -E copy
-      include/lame.h
-      ${LIBDIR}/lame/include/lame/lame.h &&
-    ${CMAKE_COMMAND} -E copy
-      output/libmp3lame-static.lib
-      ${LIBDIR}/lame/lib/mp3lame.lib
-  )
 else()
-  set(LAME_CONFIGURE
+  set(LAME_CONFIGURE ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
-    ${CONFIGURE_ENV} &&
+    --enable-export=full
-    cd ${BUILD_DIR}/lame/src/external_lame/ &&
+    --with-fileio=sndfile
-    ${CONFIGURE_COMMAND}
+    --without-vorbis
-      --prefix=${LIBDIR}/lame
+    --with-pic
-      --disable-shared
+    --disable-mp3x
-      --enable-static
+    --disable-mp3rtp
-      ${LAME_EXTRA_ARGS}
+    --disable-gtktest
-      --enable-export=full
+    --disable-frontend)
-      --with-fileio=sndfile
+  set(LAME_BUILD ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make -j${MAKE_THREADS})
-      --without-vorbis
+  set(LAME_INSTALL ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make install)
-      --with-pic
-      --disable-mp3x
-      --disable-mp3rtp
-      --disable-gtktest
-      --disable-frontend)
-  set(LAME_BUILD ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/lame/src/external_lame/ &&
-    make -j${MAKE_THREADS}
-  )
-  set(LAME_INSTALL ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/lame/src/external_lame/ &&
-    make install
-  )
 endif()
 
 ExternalProject_Add(external_lame
@@ -51,11 +29,7 @@ ExternalProject_Add(external_lame
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${LAME_HASH_TYPE}=${LAME_HASH}
   PREFIX ${BUILD_DIR}/lame
-
+  PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/lame/src/external_lame < ${PATCH_DIR}/lame.diff
-  PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/lame/src/external_lame <
-    ${PATCH_DIR}/lame.diff
-
   CONFIGURE_COMMAND ${LAME_CONFIGURE}
   BUILD_COMMAND ${LAME_BUILD}
   INSTALL_COMMAND ${LAME_INSTALL}

build_files/build_environment/cmake/level-zero.cmake

@@ -10,24 +10,14 @@ ExternalProject_Add(external_level-zero
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${LEVEL_ZERO_HASH_TYPE}=${LEVEL_ZERO_HASH}
   PREFIX ${BUILD_DIR}/level-zero
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/level-zero/src/external_level-zero < ${PATCH_DIR}/level-zero.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/level-zero ${DEFAULT_CMAKE_FLAGS} ${LEVEL_ZERO_EXTRA_ARGS}
-    ${BUILD_DIR}/level-zero/src/external_level-zero <
-    ${PATCH_DIR}/level-zero.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/level-zero
-    ${DEFAULT_CMAKE_FLAGS}
-    ${LEVEL_ZERO_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/level-zero
 )
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_level-zero after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/level-zero ${HARVEST_TARGET}/level-zero
-      ${LIBDIR}/level-zero
-      ${HARVEST_TARGET}/level-zero
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/libglu.cmake

@@ -17,18 +17,10 @@ ExternalProject_Add(external_libglu
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${LIBGLU_HASH_TYPE}=${LIBGLU_HASH}
   PREFIX ${BUILD_DIR}/libglu
-
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/libglu/src/external_libglu/ &&
     ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/libglu ${LIBGLU_EXTRA_FLAGS}
-
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/libglu/src/external_libglu/ && make -j${MAKE_THREADS}
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/libglu/src/external_libglu/ && make install
-    cd ${BUILD_DIR}/libglu/src/external_libglu/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/libglu/src/external_libglu/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/libglu
 )

build_files/build_environment/cmake/llvm.cmake

@@ -58,40 +58,22 @@ ExternalProject_Add(ll
   LIST_SEPARATOR ^^
   PREFIX ${BUILD_DIR}/ll
   SOURCE_SUBDIR llvm
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${LLVM_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
-    ${BUILD_DIR}/ll/src/ll <
-    ${PATCH_DIR}/llvm.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm
-    ${LLVM_CMAKE_FLAGS}
-    ${LLVM_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/llvm
 )
 
 if(MSVC)
   if(BUILD_MODE STREQUAL Release)
     set(LLVM_HARVEST_COMMAND
-      ${CMAKE_COMMAND} -E copy_directory
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib ${HARVEST_TARGET}/llvm/lib &&
-        ${LIBDIR}/llvm/lib
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include ${HARVEST_TARGET}/llvm/include &&
-        ${HARVEST_TARGET}/llvm/lib &&
+      ${CMAKE_COMMAND} -E copy ${LIBDIR}/llvm/bin/clang-format.exe ${HARVEST_TARGET}/llvm/bin/clang-format.exe
-      ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/llvm/include
-        ${HARVEST_TARGET}/llvm/include &&
-      ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/llvm/bin/clang-format.exe
-        ${HARVEST_TARGET}/llvm/bin/clang-format.exe
     )
   else()
     set(LLVM_HARVEST_COMMAND
-      ${CMAKE_COMMAND} -E copy_directory
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
-        ${LIBDIR}/llvm/lib/
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
-        ${HARVEST_TARGET}/llvm/debug/lib/ &&
-      ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/llvm/include/
-        ${HARVEST_TARGET}/llvm/debug/include/
     )
   endif()
   ExternalProject_Add_Step(ll after_install

build_files/build_environment/cmake/lzma.cmake

@@ -10,18 +10,9 @@ ExternalProject_Add(external_lzma
   URL_HASH ${LZMA_HASH_TYPE}=${LZMA_HASH}
   PREFIX ${BUILD_DIR}/lzma
   PATCH_COMMAND ${LZMA_PATCH_CMD}
-
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+    --disable-shared
-    cd ${BUILD_DIR}/lzma/src/external_lzma/ &&
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make -j${MAKE_THREADS}
-    ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma --disable-shared
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make install
-
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/lzma/src/external_lzma/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/lzma/src/external_lzma/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/lzma
 )

build_files/build_environment/cmake/materialx.cmake

@@ -27,12 +27,7 @@ ExternalProject_Add(external_materialx
   URL_HASH ${MATERIALX_HASH_TYPE}=${MATERIALX_HASH}
   PREFIX ${BUILD_DIR}/materialx
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/materialx ${DEFAULT_CMAKE_FLAGS} ${MATERIALX_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/materialx
-    ${DEFAULT_CMAKE_FLAGS}
-    ${MATERIALX_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/materialx
 )
 
@@ -41,39 +36,21 @@ if(WIN32)
   string(REPLACE "/" "\\" MATERIALX_PYTHON_TARGET_DOS "${MATERIALX_PYTHON_TARGET}")
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_materialx after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/include ${HARVEST_TARGET}/materialx/include
-        ${LIBDIR}/materialx/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/libraries ${HARVEST_TARGET}/materialx/libraries
-        ${HARVEST_TARGET}/materialx/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/lib/ ${HARVEST_TARGET}/materialx/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/bin/ ${HARVEST_TARGET}/materialx/bin/
-        ${LIBDIR}/materialx/libraries
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/python/ ${MATERIALX_PYTHON_TARGET}
-        ${HARVEST_TARGET}/materialx/libraries
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/materialx/lib/
-        ${HARVEST_TARGET}/materialx/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/materialx/bin/
-        ${HARVEST_TARGET}/materialx/bin/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/materialx/python/
-        ${MATERIALX_PYTHON_TARGET}
       COMMAND del ${MATERIALX_PYTHON_TARGET_DOS}\\MaterialX\\*.lib
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_materialx after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/lib/ ${HARVEST_TARGET}/materialx/lib/
-        ${LIBDIR}/materialx/lib/
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/bin/ ${HARVEST_TARGET}/materialx/bin/
-        ${HARVEST_TARGET}/materialx/lib/
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/materialx/python/ ${MATERIALX_PYTHON_TARGET}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/materialx/bin/
-        ${HARVEST_TARGET}/materialx/bin/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/materialx/python/
-        ${MATERIALX_PYTHON_TARGET}
       COMMAND del ${MATERIALX_PYTHON_TARGET_DOS}\\MaterialX\\*.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/mesa.cmake

@@ -45,22 +45,11 @@ ExternalProject_Add(external_mesa
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${MESA_HASH_TYPE}=${MESA_HASH}
   PREFIX ${BUILD_DIR}/mesa
-
   CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
     cd ${BUILD_DIR}/mesa/src/external_mesa/ &&
-    ${MESON}
+    ${MESON} ${BUILD_DIR}/mesa/src/external_mesa-build --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
-      ${BUILD_DIR}/mesa/src/external_mesa-build
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja -j${MAKE_THREADS}
-      --prefix=${LIBDIR}/mesa
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa-build && ninja install
-      ${MESA_EXTRA_FLAGS}
-
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/mesa/src/external_mesa-build &&
-    ninja -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/mesa/src/external_mesa-build &&
-    ninja install
-
   INSTALL_DIR ${LIBDIR}/mesa
 )
 

build_files/build_environment/cmake/minizipng.cmake

@@ -28,12 +28,7 @@ ExternalProject_Add(external_minizipng
   URL_HASH ${MINIZIPNG_HASH_TYPE}=${MINIZIPNG_HASH}
   PREFIX ${BUILD_DIR}/minizipng
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/minizipng ${DEFAULT_CMAKE_FLAGS} ${MINIZIPNG_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/minizipng
-    ${DEFAULT_CMAKE_FLAGS}
-    ${MINIZIPNG_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/minizipng
 )
 

build_files/build_environment/cmake/nasm.cmake

@@ -7,25 +7,10 @@ ExternalProject_Add(external_nasm
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${NASM_HASH_TYPE}=${NASM_HASH}
   PREFIX ${BUILD_DIR}/nasm
-
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/nasm/src/external_nasm < ${PATCH_DIR}/nasm.diff
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && ./autogen.sh && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/nasm
-    ${BUILD_DIR}/nasm/src/external_nasm <
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && make -j${MAKE_THREADS} && make manpages
-    ${PATCH_DIR}/nasm.diff
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/nasm/src/external_nasm/ && make install
-
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/nasm/src/external_nasm/ &&
-    ./autogen.sh &&
-    ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/nasm
-
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/nasm/src/external_nasm/ &&
-    make -j${MAKE_THREADS} &&
-    make manpages
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/nasm/src/external_nasm/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/nasm
 )
 

build_files/build_environment/cmake/numpy.cmake

@@ -25,13 +25,7 @@ ExternalProject_Add(external_numpy
   PATCH_COMMAND ${NUMPY_PATCH}
   CONFIGURE_COMMAND ""
   LOG_BUILD 1
-
+  BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
-  BUILD_COMMAND
-    ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py
-      build ${NUMPY_BUILD_OPTION}
-      install
-      --old-and-unmanageable
-
   INSTALL_COMMAND ""
 )
 

build_files/build_environment/cmake/ocloc.cmake

@@ -15,17 +15,9 @@ ExternalProject_Add(external_ocloc
   URL_HASH ${OCLOC_HASH_TYPE}=${OCLOC_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/ocloc
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ocloc ${DEFAULT_CMAKE_FLAGS} ${OCLOC_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ocloc
-    ${DEFAULT_CMAKE_FLAGS}
-    ${OCLOC_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/ocloc
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ocloc/src/external_ocloc/ < ${PATCH_DIR}/ocloc.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/ocloc/src/external_ocloc/ <
-    ${PATCH_DIR}/ocloc.diff
 )
 
 add_dependencies(

build_files/build_environment/cmake/ogg.cmake

@@ -7,10 +7,6 @@ ExternalProject_Add(external_ogg
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OGG_HASH_TYPE}=${OGG_HASH}
   PREFIX ${BUILD_DIR}/ogg
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ogg ${DEFAULT_CMAKE_FLAGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ogg
-    ${DEFAULT_CMAKE_FLAGS}
-
   INSTALL_DIR ${LIBDIR}/ogg
 )

build_files/build_environment/cmake/openal.cmake

@@ -36,27 +36,15 @@ if(BUILD_MODE STREQUAL Release)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${OPENAL_HASH_TYPE}=${OPENAL_HASH}
     PREFIX ${BUILD_DIR}/openal
-
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal
-      ${DEFAULT_CMAKE_FLAGS}
-      ${OPENAL_EXTRA_ARGS}
-
     INSTALL_DIR ${LIBDIR}/openal
   )
 
   if(WIN32)
     ExternalProject_Add_Step(external_openal after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib
-        ${LIBDIR}/openal/lib/openal32.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll
-        ${HARVEST_TARGET}/openal/lib/openal32.lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/openal/bin/openal32.dll
-        ${HARVEST_TARGET}/openal/lib/openal32.dll
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/openal/include/
-        ${HARVEST_TARGET}/openal/include/
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/opencollada.cmake

@@ -40,18 +40,10 @@ ExternalProject_Add(external_opencollada
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENCOLLADA_HASH_TYPE}=${OPENCOLLADA_HASH}
   PREFIX ${BUILD_DIR}/opencollada
-
   PATCH_COMMAND
     ${PATCH_MAYBE_DOS2UNIX_CMD}
-    ${PATCH_CMD} -p 1 -N -d
+    ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
-      ${BUILD_DIR}/opencollada/src/external_opencollada <
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}
-      ${PATCH_DIR}/opencollada.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada
-    ${DEFAULT_CMAKE_FLAGS}
-    ${OPENCOLLADA_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/opencollada
 )
 
@@ -65,19 +57,13 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_opencollada after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/
-        ${LIBDIR}/opencollada/
-        ${HARVEST_TARGET}/opencollada/
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_opencollada after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/lib ${HARVEST_TARGET}/opencollada/lib
-        ${LIBDIR}/opencollada/lib
-        ${HARVEST_TARGET}/opencollada/lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/opencolorio.cmake

@@ -68,12 +68,7 @@ ExternalProject_Add(external_opencolorio
   URL_HASH ${OPENCOLORIO_HASH_TYPE}=${OPENCOLORIO_HASH}
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/opencolorio
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio
-    ${DEFAULT_CMAKE_FLAGS}
-    ${OPENCOLORIO_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/opencolorio
 )
 
@@ -92,46 +87,25 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_opencolorio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
-        ${LIBDIR}/opencolorio/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/bin/OpenColorIO_2_3.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_2_3.dll
-        ${HARVEST_TARGET}/opencolorio/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib ${HARVEST_TARGET}/opencolorio/lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/opencolorio/bin/OpenColorIO_2_3.dll
-        ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_2_3.dll
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/opencolorio/lib
-        ${HARVEST_TARGET}/opencolorio/lib
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_opencolorio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/bin/OpenColorIO_d_2_3.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_d_2_3.dll
-        ${LIBDIR}/opencolorio/bin/OpenColorIO_d_2_3.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/Opencolorio_d.lib ${HARVEST_TARGET}/opencolorio/lib/OpenColorIO_d.lib
-        ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO_d_2_3.dll
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/site-packages ${HARVEST_TARGET}/opencolorio/lib/site-packages-debug
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/opencolorio/lib/Opencolorio_d.lib
-        ${HARVEST_TARGET}/opencolorio/lib/OpenColorIO_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/opencolorio/lib/site-packages
-        ${HARVEST_TARGET}/opencolorio/lib/site-packages-debug
-
       DEPENDEES install
     )
   endif()
 else()
   ExternalProject_Add_Step(external_opencolorio after_install
-    COMMAND cp
+    COMMAND cp ${LIBDIR}/yamlcpp/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/
-      ${LIBDIR}/yamlcpp/lib/libyaml-cpp.a
+    COMMAND cp ${LIBDIR}/expat/lib/libexpat.a ${LIBDIR}/opencolorio/lib/
-      ${LIBDIR}/opencolorio/lib/
+    COMMAND cp ${LIBDIR}/pystring/lib/libpystring.a ${LIBDIR}/opencolorio/lib/
-    COMMAND cp
-      ${LIBDIR}/expat/lib/libexpat.a
-      ${LIBDIR}/opencolorio/lib/
-    COMMAND cp
-      ${LIBDIR}/pystring/lib/libpystring.a
-      ${LIBDIR}/opencolorio/lib/
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/openexr.cmake

@@ -28,46 +28,22 @@ ExternalProject_Add(external_openexr
   URL file://${PACKAGE_DIR}/${OPENEXR_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENEXR_HASH_TYPE}=${OPENEXR_HASH}
-
+  PATCH_COMMAND ${PATCH_CMD} -p 2 -d ${BUILD_DIR}/openexr/src/external_openexr < ${PATCH_DIR}/openexr_deflate_1588.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 2 -d
-    ${BUILD_DIR}/openexr/src/external_openexr <
-    ${PATCH_DIR}/openexr_deflate_1588.diff
-
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openexr
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr
-    ${DEFAULT_CMAKE_FLAGS}
-    ${OPENEXR_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/openexr
 )
 
 if(WIN32)
   ExternalProject_Add_Step(external_openexr after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
-      ${LIBDIR}/openexr/lib
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
-      ${HARVEST_TARGET}/openexr/lib
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/Iex${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/Iex${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/IlmThread${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/IlmThread${OPENEXR_VERSION_POSTFIX}.dll
-      ${LIBDIR}/openexr/include
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXRCore${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXRCore${OPENEXR_VERSION_POSTFIX}.dll
-      ${HARVEST_TARGET}/openexr/include
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXRUtil${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXRUtil${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/bin/OpenEXR${OPENEXR_VERSION_POSTFIX}.dll ${HARVEST_TARGET}/openexr/bin/OpenEXR${OPENEXR_VERSION_POSTFIX}.dll
-      ${LIBDIR}/openexr/bin/Iex${OPENEXR_VERSION_POSTFIX}.dll
-      ${HARVEST_TARGET}/openexr/bin/Iex${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/openexr/bin/IlmThread${OPENEXR_VERSION_POSTFIX}.dll
-      ${HARVEST_TARGET}/openexr/bin/IlmThread${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/openexr/bin/OpenEXRCore${OPENEXR_VERSION_POSTFIX}.dll
-      ${HARVEST_TARGET}/openexr/bin/OpenEXRCore${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/openexr/bin/OpenEXRUtil${OPENEXR_VERSION_POSTFIX}.dll
-      ${HARVEST_TARGET}/openexr/bin/OpenEXRUtil${OPENEXR_VERSION_POSTFIX}.dll
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/openexr/bin/OpenEXR${OPENEXR_VERSION_POSTFIX}.dll
-      ${HARVEST_TARGET}/openexr/bin/OpenEXR${OPENEXR_VERSION_POSTFIX}.dll
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -58,16 +58,8 @@ ExternalProject_Add(external_openimagedenoise
   URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
   PREFIX ${BUILD_DIR}/openimagedenoise
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${OIDN_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
-  CMAKE_ARGS
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/oidn.diff
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise
-    ${OIDN_CMAKE_FLAGS}
-    ${OIDN_EXTRA_ARGS}
-
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d
-    ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise <
-    ${PATCH_DIR}/oidn.diff
-
   INSTALL_DIR ${LIBDIR}/openimagedenoise
 )
 
@@ -95,16 +87,9 @@ endif()
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
     ExternalProject_Add_Step(external_openimagedenoise after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openimagedenoise/bin ${HARVEST_TARGET}/openimagedenoise/bin
-        ${LIBDIR}/openimagedenoise/bin
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openimagedenoise/lib ${HARVEST_TARGET}/openimagedenoise/lib
-        ${HARVEST_TARGET}/openimagedenoise/bin
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openimagedenoise/include ${HARVEST_TARGET}/openimagedenoise/include
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/openimagedenoise/lib
-        ${HARVEST_TARGET}/openimagedenoise/lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/openimagedenoise/include
-        ${HARVEST_TARGET}/openimagedenoise/include
-
       DEPENDEES install
     )
 endif()

build_files/build_environment/cmake/openimageio.cmake

@@ -108,26 +108,11 @@ ExternalProject_Add(external_openimageio
   URL_HASH ${OPENIMAGEIO_HASH_TYPE}=${OPENIMAGEIO_HASH}
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openimageio
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio.diff &&
-  PATCH_COMMAND
+                ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/oiio_webp.diff &&
-    ${PATCH_CMD} -p 1 -N -d
+                ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/oiio_4044.diff &&
-      ${BUILD_DIR}/openimageio/src/external_openimageio/ <
+                ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/oiio_4062.diff
-      ${PATCH_DIR}/openimageio.diff &&
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
-    ${PATCH_CMD} -p 1 -N -d
-      ${BUILD_DIR}/openimageio/src/external_openimageio/ <
-      ${PATCH_DIR}/oiio_webp.diff &&
-    ${PATCH_CMD} -p 1 -N -d
-      ${BUILD_DIR}/openimageio/src/external_openimageio/ <
-      ${PATCH_DIR}/oiio_4044.diff &&
-    ${PATCH_CMD} -p 1 -N -d
-      ${BUILD_DIR}/openimageio/src/external_openimageio/ <
-      ${PATCH_DIR}/oiio_4062.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio
-    ${DEFAULT_CMAKE_FLAGS}
-    ${OPENIMAGEIO_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/openimageio
 )
 
@@ -153,58 +138,26 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_openimageio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include
-        ${LIBDIR}/OpenImageIO/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib
-        ${HARVEST_TARGET}/OpenImageIO/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/iconvert.exe ${HARVEST_TARGET}/OpenImageIO/bin/iconvert.exe
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe
-        ${LIBDIR}/OpenImageIO/lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/igrep.exe ${HARVEST_TARGET}/OpenImageIO/bin/igrep.exe
-        ${HARVEST_TARGET}/OpenImageIO/lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/iinfo.exe ${HARVEST_TARGET}/OpenImageIO/bin/iinfo.exe
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/maketx.exe ${HARVEST_TARGET}/OpenImageIO/bin/maketx.exe
-        ${LIBDIR}/OpenImageIO/bin/iconvert.exe
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/oiiotool.exe ${HARVEST_TARGET}/OpenImageIO/bin/oiiotool.exe
-        ${HARVEST_TARGET}/OpenImageIO/bin/iconvert.exe
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_Util.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_Util.dll
-        ${LIBDIR}/OpenImageIO/bin/idiff.exe
-        ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/OpenImageIO/bin/igrep.exe
-        ${HARVEST_TARGET}/OpenImageIO/bin/igrep.exe
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/OpenImageIO/bin/iinfo.exe
-        ${HARVEST_TARGET}/OpenImageIO/bin/iinfo.exe
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/OpenImageIO/bin/maketx.exe
-        ${HARVEST_TARGET}/OpenImageIO/bin/maketx.exe
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/OpenImageIO/bin/oiiotool.exe
-        ${HARVEST_TARGET}/OpenImageIO/bin/oiiotool.exe
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/OpenImageIO/bin/OpenImageIO.dll
-        ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/OpenImageIO/bin/OpenImageIO_Util.dll
-        ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_Util.dll
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_openimageio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
-        ${LIBDIR}/openimageio/lib/OpenImageIO_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util_d.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
-        ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_d.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/OpenImageIO_Util_d.dll ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_Util_d.dll
-        ${LIBDIR}/openimageio/lib/OpenImageIO_Util_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib/python${PYTHON_SHORT_VERSION}/ ${HARVEST_TARGET}/OpenImageIO/lib/python${PYTHON_SHORT_VERSION}_debug/
-        ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/OpenImageIO/bin/OpenImageIO_d.dll
-        ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/OpenImageIO/bin/OpenImageIO_Util_d.dll
-        ${HARVEST_TARGET}/OpenImageIO/bin/OpenImageIO_Util_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/OpenImageIO/lib/python${PYTHON_SHORT_VERSION}/
-        ${HARVEST_TARGET}/OpenImageIO/lib/python${PYTHON_SHORT_VERSION}_debug/
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/openjpeg.cmake

@@ -19,22 +19,9 @@ if(NOT WIN32)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
     PREFIX ${BUILD_DIR}/openjpeg
-
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg ${BUILD_DIR}/openjpeg/src/external_openjpeg
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
-      cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build &&
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make install
-      ${CMAKE_COMMAND}
-        ${OPENJPEG_EXTRA_ARGS}
-        -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg
-        ${BUILD_DIR}/openjpeg/src/external_openjpeg
-
-    BUILD_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ &&
-      make -j${MAKE_THREADS}
-
-    INSTALL_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ &&
-      make install
-
     INSTALL_DIR ${LIBDIR}/openjpeg
   )
 else()
@@ -43,34 +30,20 @@ else()
     URL file://${PACKAGE_DIR}/${OPENJPEG_FILE}
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${OPENJPEG_HASH_TYPE}=${OPENJPEG_HASH}
-
+    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openjpeg_msvc/src/external_openjpeg_msvc < ${PATCH_DIR}/openjpeg_msvc.diff
-    PATCH_COMMAND ${PATCH_CMD} -p 1 -d
-      ${BUILD_DIR}/openjpeg_msvc/src/external_openjpeg_msvc <
-      ${PATCH_DIR}/openjpeg_msvc.diff
-
     PREFIX ${BUILD_DIR}/openjpeg_msvc
-
+    CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
-    CMAKE_ARGS
-      ${OPENJPEG_EXTRA_ARGS}
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc
-      -DBUILD_SHARED_LIBS=Off
-      -DBUILD_THIRDPARTY=OFF
-
     INSTALL_DIR ${LIBDIR}/openjpeg_msvc
   )
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_openjpeg_msvc after_install
       COMMAND
-      ${CMAKE_COMMAND} -E copy_directory
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
-        ${LIBDIR}/openjpeg_msvc/lib
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
-        ${HARVEST_TARGET}/openjpeg/lib &&
-      ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/openjpeg_msvc/include
-        ${HARVEST_TARGET}/openjpeg/include
 
       DEPENDEES install
     )
-  endif()
+endif()
 endif()
 
 set(OPENJPEG_LIBRARY libopenjp2${LIBEXT})

build_files/build_environment/cmake/openmp.cmake

@@ -3,11 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 if(APPLE)
-  set(OPENMP_PATCH_COMMAND
+  set(OPENMP_PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff)
-    ${PATCH_CMD} -p 1 -d
-      ${BUILD_DIR}/openmp/src/external_openmp <
-      ${PATCH_DIR}/openmp.diff
-  )
 else()
   set(OPENMP_PATCH_COMMAND)
 endif()
@@ -18,16 +14,8 @@ ExternalProject_Add(external_openmp
   URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
   PREFIX ${BUILD_DIR}/openmp
   PATCH_COMMAND ${OPENMP_PATCH_COMMAND}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-  CMAKE_ARGS
+  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @rpath/libomp.dylib runtime/src/libomp.dylib && make install
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp
-    ${DEFAULT_CMAKE_FLAGS}
-
-  INSTALL_COMMAND
-    cd ${BUILD_DIR}/openmp/src/external_openmp-build &&
-    install_name_tool -id @rpath/libomp.dylib runtime/src/libomp.dylib &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/openmp
 )
 

build_files/build_environment/cmake/openpgl.cmake

@@ -24,12 +24,7 @@ ExternalProject_Add(external_openpgl
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENPGL_HASH_TYPE}=${OPENPGL_HASH}
   PREFIX ${BUILD_DIR}/openpgl
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openpgl ${DEFAULT_CMAKE_FLAGS} ${OPENPGL_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openpgl
-    ${DEFAULT_CMAKE_FLAGS}
-    ${OPENPGL_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/openpgl
 )
 
@@ -41,21 +36,13 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_openpgl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openpgl ${HARVEST_TARGET}/openpgl
-        ${LIBDIR}/openpgl
-        ${HARVEST_TARGET}/openpgl
-
       DEPENDEES install
     )
   else()
   ExternalProject_Add_Step(external_openpgl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy $
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openpgl/lib/openpgl_d.lib ${HARVEST_TARGET}/openpgl/lib/openpgl_d.lib
-        {LIBDIR}/openpgl/lib/openpgl_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION}/openpgl_Exports-debug.cmake ${HARVEST_TARGET}/openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION}/openpgl_Exports-debug.cmake
-        ${HARVEST_TARGET}/openpgl/lib/openpgl_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy $
-        {LIBDIR}/openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION}/openpgl_Exports-debug.cmake
-        ${HARVEST_TARGET}/openpgl/lib/cmake/openpgl-${OPENPGL_SHORT_VERSION}/openpgl_Exports-debug.cmake
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/opensubdiv.cmake

@@ -31,37 +31,22 @@ ExternalProject_Add(external_opensubdiv
   URL_HASH ${OPENSUBDIV_HASH_TYPE}=${OPENSUBDIV_HASH}
   PREFIX ${BUILD_DIR}/opensubdiv
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv
-    -Wno-dev ${DEFAULT_CMAKE_FLAGS}
-    ${OPENSUBDIV_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/opensubdiv
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_opensubdiv after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/lib ${HARVEST_TARGET}/opensubdiv/lib
-        ${LIBDIR}/opensubdiv/lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/include ${HARVEST_TARGET}/opensubdiv/include
-        ${HARVEST_TARGET}/opensubdiv/lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/opensubdiv/include
-        ${HARVEST_TARGET}/opensubdiv/include
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_opensubdiv after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib
-        ${LIBDIR}/opensubdiv/lib/osdCPU.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib
-        ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy $
-        {LIBDIR}/opensubdiv/lib/osdGPU.lib
-        ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/openvdb.cmake

@@ -48,15 +48,9 @@ set(OPENVDB_EXTRA_ARGS
 )
 
 set(OPENVDB_PATCH
-  ${PATCH_CMD} -p 1 -d
+  ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff &&
-    ${BUILD_DIR}/openvdb/src/openvdb <
+  ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_1706.diff &&
-    ${PATCH_DIR}/openvdb.diff &&
+  ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_1733.diff
-  ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/openvdb/src/openvdb <
-    ${PATCH_DIR}/openvdb_1706.diff &&
-  ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/openvdb/src/openvdb <
-    ${PATCH_DIR}/openvdb_1733.diff
 )
 
 ExternalProject_Add(openvdb
@@ -66,12 +60,7 @@ ExternalProject_Add(openvdb
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/openvdb
   PATCH_COMMAND ${OPENVDB_PATCH}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb
-    ${DEFAULT_CMAKE_FLAGS}
-    ${OPENVDB_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/openvdb
 )
 
@@ -89,34 +78,18 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
-        ${LIBDIR}/openvdb/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
-        ${HARVEST_TARGET}/openvdb/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb.dll ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/python${PYTHON_SHORT_VERSION}/site-packages/pyopenvdb.cp${PYTHON_SHORT_VERSION_NO_DOTS}-win_amd64.pyd ${HARVEST_TARGET}openvdb/python/pyopenvdb.cp${PYTHON_SHORT_VERSION_NO_DOTS}-win_amd64.pyd
-        ${LIBDIR}/openvdb/lib/openvdb.lib
-        ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/openvdb/bin/openvdb.dll
-        ${HARVEST_TARGET}/openvdb/bin/openvdb.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/openvdb/lib/python${PYTHON_SHORT_VERSION}/site-packages/pyopenvdb.cp${PYTHON_SHORT_VERSION_NO_DOTS}-win_amd64.pyd
-        ${HARVEST_TARGET}openvdb/python/pyopenvdb.cp${PYTHON_SHORT_VERSION_NO_DOTS}-win_amd64.pyd
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb_d.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
-        ${LIBDIR}/openvdb/lib/openvdb_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/bin/openvdb_d.dll ${HARVEST_TARGET}/openvdb/bin/openvdb_d.dll
-        ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/python${PYTHON_SHORT_VERSION}/site-packages/pyopenvdb_d.cp${PYTHON_SHORT_VERSION_NO_DOTS}-win_amd64.pyd ${HARVEST_TARGET}openvdb/python/pyopenvdb_d.cp${PYTHON_SHORT_VERSION_NO_DOTS}-win_amd64.pyd
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/openvdb/bin/openvdb_d.dll
-        ${HARVEST_TARGET}/openvdb/bin/openvdb_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/openvdb/lib/python${PYTHON_SHORT_VERSION}/site-packages/pyopenvdb_d.cp${PYTHON_SHORT_VERSION_NO_DOTS}-win_amd64.pyd
-        ${HARVEST_TARGET}openvdb/python/pyopenvdb_d.cp${PYTHON_SHORT_VERSION_NO_DOTS}-win_amd64.pyd
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/opus.cmake

@@ -16,24 +16,13 @@ if(NOT WIN32)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${OPUS_HASH_TYPE}=${OPUS_HASH}
     PREFIX ${BUILD_DIR}/opus
-
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/opus
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+      --disable-shared
-      cd ${BUILD_DIR}/opus/src/external_opus/ &&
+      --enable-static
-      ${CONFIGURE_COMMAND}
+      --with-pic
-        --prefix=${LIBDIR}/opus
+      --disable-maintainer-mode
-        --disable-shared
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && make -j${MAKE_THREADS}
-        --enable-static
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && make install
-        --with-pic
-        --disable-maintainer-mode
-
-    BUILD_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/opus/src/external_opus/ &&
-      make -j${MAKE_THREADS}
-
-    INSTALL_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/opus/src/external_opus/ &&
-      make install
-
     INSTALL_DIR ${LIBDIR}/opus
   )
 else()
@@ -42,16 +31,8 @@ else()
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${OPUS_HASH_TYPE}=${OPUS_HASH}
     PREFIX ${BUILD_DIR}/opus
-
+    PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/opus/src/external_opus < ${PATCH_DIR}/opus_windows.diff
-    PATCH_COMMAND COMMAND
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opus ${OPUS_CMAKE_ARGS}
-      ${PATCH_CMD} -p 1 -d
-        ${BUILD_DIR}/opus/src/external_opus <
-        ${PATCH_DIR}/opus_windows.diff
-
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opus
-      ${OPUS_CMAKE_ARGS}
-
     INSTALL_DIR ${LIBDIR}/opus
   )
 endif()

build_files/build_environment/cmake/osl.cmake

@@ -54,17 +54,8 @@ ExternalProject_Add(external_osl
   LIST_SEPARATOR ^^
   URL_HASH ${OSL_HASH_TYPE}=${OSL_HASH}
   PREFIX ${BUILD_DIR}/osl
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
-    ${BUILD_DIR}/osl/src/external_osl <
-    ${PATCH_DIR}/osl.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    ${DEFAULT_CMAKE_FLAGS}
-    ${OSL_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/osl
 )
 
@@ -92,40 +83,20 @@ endif()
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_osl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl
-        ${LIBDIR}/osl/
-        ${HARVEST_TARGET}/osl
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_osl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp_d.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib
-        ${LIBDIR}/osl/lib/oslcomp_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec_d.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib
-        ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery_d.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslnoise_d.lib ${HARVEST_TARGET}/osl/lib/oslnoise_d.lib
-        ${LIBDIR}/osl/lib/oslexec_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/bin/oslcomp_d.dll ${HARVEST_TARGET}/osl/bin/oslcomp_d.dll
-        ${HARVEST_TARGET}/osl/lib/oslexec_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/bin/oslexec_d.dll ${HARVEST_TARGET}/osl/bin/oslexec_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/bin/oslquery_d.dll ${HARVEST_TARGET}/osl/bin/oslquery_d.dll
-        ${LIBDIR}/osl/lib/oslquery_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/bin/oslnoise_d.dll ${HARVEST_TARGET}/osl/bin/oslnoise_d.dll
-        ${HARVEST_TARGET}/osl/lib/oslquery_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/osl/lib/oslnoise_d.lib
-        ${HARVEST_TARGET}/osl/lib/oslnoise_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/osl/bin/oslcomp_d.dll
-        ${HARVEST_TARGET}/osl/bin/oslcomp_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/osl/bin/oslexec_d.dll
-        ${HARVEST_TARGET}/osl/bin/oslexec_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/osl/bin/oslquery_d.dll
-        ${HARVEST_TARGET}/osl/bin/oslquery_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/osl/bin/oslnoise_d.dll
-        ${HARVEST_TARGET}/osl/bin/oslnoise_d.dll
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/package_python.cmake

@@ -9,92 +9,38 @@ if(MSVC)
   if(BUILD_MODE STREQUAL Release)
     add_custom_command(
       OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-
       COMMAND echo packaging python
       COMMAND echo this should output at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
       COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
-        ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python.exe ${PYTARGET}/bin/python.exe
-        ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python3${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python3${PYTHON_POSTFIX}.dll
-        ${PYSRC}/python.exe
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb
-        ${PYTARGET}/bin/python.exe
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/include/ ${PYTARGET}/include/
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/lib/ ${PYTARGET}/lib/
-        ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/DLLs/ ${PYTARGET}/DLLs/
-        ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll
+      COMMAND cd ${PYTARGET}/lib/ && for /d /r . %%d in (__pycache__) do @if exist "%%d" echo "%%d" && rd /s/q "%%d"
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${PYSRC}/python3${PYTHON_POSTFIX}.dll
-        ${PYTARGET}/bin/python3${PYTHON_POSTFIX}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb
-        ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${PYSRC}/include/
-        ${PYTARGET}/include/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${PYSRC}/lib/
-        ${PYTARGET}/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${PYSRC}/DLLs/
-        ${PYTARGET}/DLLs/
-
-      COMMAND cd ${PYTARGET}/lib/ &&
-        for /d /r . %%d in (__pycache__) do @if exist "%%d" echo "%%d" &&
-        rd /s/q "%%d"
-    )
-    add_custom_target(Package_Python
-      ALL
-      DEPENDS
-        external_python
-        external_numpy
-        external_python_site_packages
-      OUTPUT
-        ${HARVEST_TARGET}/python/${PYTHON_SHORT_VERSION_NO_DOTS}/bin/python${PYTHON_POSTFIX}.exe
     )
+    add_custom_target(Package_Python ALL DEPENDS external_python external_numpy external_python_site_packages OUTPUT ${HARVEST_TARGET}/python/${PYTHON_SHORT_VERSION_NO_DOTS}/bin/python${PYTHON_POSTFIX}.exe)
   endif()
 
   if(BUILD_MODE STREQUAL Debug)
     add_custom_command(
       OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-
       COMMAND echo packaging python
       COMMAND echo this should output at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
       COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib
-        ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_POSTFIX}.exe ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-        ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python3${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python3${PYTHON_POSTFIX}.dll
-        ${PYSRC}/python${PYTHON_POSTFIX}.exe
+      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb
-        ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/include/ ${PYTARGET}/include/
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/lib/ ${PYTARGET}/lib/
-        ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/DLLs/ ${PYTARGET}/DLLs/
-        ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
+      COMMAND cd ${PYTARGET}/lib/ && for /d /r . %%d in (__pycache__) do @if exist "%%d" echo "%%d" && rd /s/q "%%d"
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${PYSRC}/python3${PYTHON_POSTFIX}.dll
-        ${PYTARGET}/bin/python3${PYTHON_POSTFIX}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb
-        ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${PYSRC}/include/
-        ${PYTARGET}/include/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${PYSRC}/lib/
-        ${PYTARGET}/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${PYSRC}/DLLs/
-        ${PYTARGET}/DLLs/
-
-      COMMAND cd ${PYTARGET}/lib/ &&
-        for /d /r . %%d in (__pycache__) do @if exist "%%d" echo "%%d" &&
-        rd /s/q "%%d"
-    )
-    add_custom_target(Package_Python
-      ALL
-      DEPENDS
-        external_python external_numpy external_python_site_packages
-      OUTPUT
-      ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
     )
+    add_custom_target(Package_Python ALL DEPENDS external_python external_numpy external_python_site_packages OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe)
   endif()
 endif()

build_files/build_environment/cmake/png.cmake

@@ -9,12 +9,7 @@ set(PNG_EXTRA_ARGS
 )
 
 if(BLENDER_PLATFORM_ARM)
-  set(PNG_EXTRA_ARGS
+  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=on -DCMAKE_SYSTEM_PROCESSOR="aarch64")
-    ${PNG_EXTRA_ARGS}
-    -DPNG_HARDWARE_OPTIMIZATIONS=ON
-    -DPNG_ARM_NEON=on
-    -DCMAKE_SYSTEM_PROCESSOR="aarch64"
-  )
 endif()
 
 ExternalProject_Add(external_png
@@ -22,12 +17,7 @@ ExternalProject_Add(external_png
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${PNG_HASH_TYPE}=${PNG_HASH}
   PREFIX ${BUILD_DIR}/png
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png
-    ${DEFAULT_CMAKE_FLAGS}
-    ${PNG_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/png
 )
 
@@ -38,23 +28,15 @@ add_dependencies(
 
 if(WIN32 AND BUILD_MODE STREQUAL Release)
   ExternalProject_Add_Step(external_png after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/
-      ${LIBDIR}/png/include/
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static${LIBEXT} ${HARVEST_TARGET}/png/lib/libpng${LIBEXT}
-      ${HARVEST_TARGET}/png/include/
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/png/lib/libpng16_static${LIBEXT}
-      ${HARVEST_TARGET}/png/lib/libpng${LIBEXT}
-
     DEPENDEES install
   )
 endif()
 
 if(WIN32 AND BUILD_MODE STREQUAL Debug)
   ExternalProject_Add_Step(external_png after_install
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT}
-      ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT}
-      ${LIBDIR}/png/lib/libpng16${LIBEXT}
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/potrace.cmake

@@ -11,24 +11,13 @@ if((WIN32 AND BUILD_MODE STREQUAL Release) OR UNIX)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${POTRACE_HASH_TYPE}=${POTRACE_HASH}
     PREFIX ${BUILD_DIR}/potrace
-
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_potrace.txt ${BUILD_DIR}/potrace/src/external_potrace/CMakeLists.txt
-    PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/potrace ${DEFAULT_CMAKE_FLAGS} ${POTRACE_EXTRA_ARGS}
-      ${PATCH_DIR}/cmakelists_potrace.txt
-      ${BUILD_DIR}/potrace/src/external_potrace/CMakeLists.txt
-
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/potrace
-      ${DEFAULT_CMAKE_FLAGS}
-      ${POTRACE_EXTRA_ARGS}
-
     INSTALL_DIR ${LIBDIR}/potrace
   )
   if(WIN32)
     ExternalProject_Add_Step(external_potrace after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/potrace ${HARVEST_TARGET}/potrace
-        ${LIBDIR}/potrace
-        ${HARVEST_TARGET}/potrace
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/pthreads.cmake

@@ -10,11 +10,7 @@ if(WIN32)
     set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H ")
   endif()
 
-  set(PTHREADS_BUILD
+  set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS})
-    cd ${BUILD_DIR}/pthreads/src/external_pthreads/ &&
-    cd &&
-    nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS}
-  )
 
   ExternalProject_Add(external_pthreads
     URL file://${PACKAGE_DIR}/${PTHREADS_FILE}
@@ -22,42 +18,21 @@ if(WIN32)
     URL_HASH ${PTHREADS_HASH_TYPE}=${PTHREADS_HASH}
     PREFIX ${BUILD_DIR}/pthreads
     CONFIGURE_COMMAND echo .
-
+    PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff
-    PATCH_COMMAND COMMAND ${PATCH_CMD} -p 1 -d
-      ${BUILD_DIR}/pthreads/src/external_pthreads <
-      ${PATCH_DIR}/pthreads.diff
-
     BUILD_COMMAND ${PTHREADS_BUILD}
-
     INSTALL_COMMAND COMMAND
-      ${CMAKE_COMMAND} -E copy
+      ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
-        ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT}
+      ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
-        ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
+      ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
-      ${CMAKE_COMMAND} -E copy
+      ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h &&
-        ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h
+      ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/_ptw32.h ${LIBDIR}/pthreads/inc/_ptw32.h
-        ${LIBDIR}/pthreads/inc/pthread.h &&
-      ${CMAKE_COMMAND} -E copy
-        ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h
-        ${LIBDIR}/pthreads/inc/sched.h &&
-      ${CMAKE_COMMAND} -E copy
-        ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h
-        ${LIBDIR}/pthreads/inc/semaphore.h &&
-      ${CMAKE_COMMAND} -E copy
-        ${BUILD_DIR}/pthreads/src/external_pthreads/_ptw32.h
-        ${LIBDIR}/pthreads/inc/_ptw32.h
-
     INSTALL_DIR ${LIBDIR}/pthreads
   )
 
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_pthreads after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/
-        ${LIBDIR}/pthreads/inc/
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib
-        ${HARVEST_TARGET}/pthreads/include/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/pthreads/lib/
-        ${HARVEST_TARGET}/pthreads/lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/pugixml.cmake

@@ -10,30 +10,19 @@ ExternalProject_Add(external_pugixml
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${PUGIXML_HASH_TYPE}=${PUGIXML_HASH}
   PREFIX ${BUILD_DIR}/pugixml
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml
-    ${DEFAULT_CMAKE_FLAGS}
-    ${PUGIXML_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/pugixml
 )
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_pugixml after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pugixml ${HARVEST_TARGET}/pugixml
-        ${LIBDIR}/pugixml
-        ${HARVEST_TARGET}/pugixml
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_pugixml after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/pugixml/lib/pugixml_d.lib
-        ${LIBDIR}/pugixml/lib/pugixml.lib
-        ${HARVEST_TARGET}/pugixml/lib/pugixml_d.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/pybind11.cmake

@@ -13,16 +13,8 @@ ExternalProject_Add(external_pybind11
   URL_HASH ${PYBIND11_HASH_TYPE}=${PYBIND11_HASH}
   PREFIX ${BUILD_DIR}/pybind11
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/pybind11/src/external_pybind11 < ${PATCH_DIR}/pybind11_4761.diff
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pybind11 ${DEFAULT_CMAKE_FLAGS} ${PYBIND11_EXTRA_ARGS}
-    ${BUILD_DIR}/pybind11/src/external_pybind11 <
-    ${PATCH_DIR}/pybind11_4761.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pybind11
-    ${DEFAULT_CMAKE_FLAGS}
-    ${PYBIND11_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/pybind11
 )
 

build_files/build_environment/cmake/pystring.cmake

@@ -10,28 +10,15 @@ ExternalProject_Add(external_pystring
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${PYSTRING_HASH_TYPE}=${PYSTRING_HASH}
   PREFIX ${BUILD_DIR}/pystring
-
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_pystring.txt ${BUILD_DIR}/pystring/src/external_pystring/CMakeLists.txt
-  PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pystring ${DEFAULT_CMAKE_FLAGS} ${PYSTRING_EXTRA_ARGS}
-    ${PATCH_DIR}/cmakelists_pystring.txt
-    ${BUILD_DIR}/pystring/src/external_pystring/CMakeLists.txt
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pystring
-    ${DEFAULT_CMAKE_FLAGS}
-    ${PYSTRING_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/pystring
 )
 
 if(WIN32)
   ExternalProject_Add_Step(external_pystring after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pystring/lib ${HARVEST_TARGET}/pystring/lib
-      ${LIBDIR}/pystring/lib
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pystring/include ${HARVEST_TARGET}/pystring/include
-      ${HARVEST_TARGET}/pystring/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-      ${LIBDIR}/pystring/include
-      ${HARVEST_TARGET}/pystring/include
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/python.cmake

@@ -31,7 +31,6 @@ if(WIN32)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${PYTHON_HASH_TYPE}=${PYTHON_HASH}
     PREFIX ${BUILD_DIR}/python
-
     # Python will download its own deps and there's very little we can do about
     # that beyond placing some code in their externals dir before it tries.
     # the foldernames *HAVE* to match the ones inside pythons get_externals.cmd.
@@ -39,35 +38,11 @@ if(WIN32)
     PATCH_COMMAND mkdir ${PYTHON_EXTERNALS_FOLDER_DOS} &&
       mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\zlib-1.2.13 ${ZLIB_SOURCE_FOLDER_DOS} &&
       mklink /J ${PYTHON_EXTERNALS_FOLDER_DOS}\\openssl-3.0.11 ${SSL_SOURCE_FOLDER_DOS} &&
-      ${CMAKE_COMMAND} -E copy
+      ${CMAKE_COMMAND} -E copy ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.13/zconf.h &&
-        ${ZLIB_SOURCE_FOLDER}/../external_zlib-build/zconf.h
+      ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_windows.diff
-        ${PYTHON_EXTERNALS_FOLDER}/zlib-1.2.13/zconf.h &&
-      ${PATCH_CMD} --verbose -p1 -d
-        ${BUILD_DIR}/python/src/external_python <
-        ${PATCH_DIR}/python_windows.diff
-
     CONFIGURE_COMMAND echo "."
-
+    BUILD_COMMAND ${CONFIGURE_ENV_MSVC} && cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && set LDFLAGS=/DEBUG && call prepare_ssl.bat && call build.bat -e -p x64 -c ${BUILD_MODE}
-    BUILD_COMMAND ${CONFIGURE_ENV_MSVC} &&
+    INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/ --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
-      cd ${BUILD_DIR}/python/src/external_python/pcbuild/ &&
-      set IncludeTkinter=false &&
-      set LDFLAGS=/DEBUG &&
-      call prepare_ssl.bat &&
-      call build.bat -e -p x64 -c ${BUILD_MODE}
-
-    INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py
-      -b ${PYTHON_SRC}/PCbuild/amd64
-      -s ${PYTHON_SRC}
-      -t ${PYTHON_SRC}/tmp/
-      --include-stable
-      --include-pip
-      --include-dev
-      --include-launchers
-      --include-venv
-      --include-symbols
-      ${PYTHON_EXTRA_INSTLAL_FLAGS}
-      --copy
-      ${LIBDIR}/python
   )
   add_dependencies(
     external_python
@@ -125,22 +100,14 @@ else()
     export LIBLZMA_LIBS=${LIBDIR}/lzma/lib/${LIBPREFIX}lzma${LIBEXT}
     export ZLIB_CFLAGS=-I${LIBDIR}/zlib/include
     export ZLIB_LIBS=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  )
+    )
 
   # This patch indludes changes to fix missing -lm for sqlite and and fix the order of
   # -ldl flags for ssl to avoid link errors.
   if(APPLE)
-    set(PYTHON_PATCH
+    set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_apple.diff)
-      ${PATCH_CMD} --verbose -p1 -d
-        ${BUILD_DIR}/python/src/external_python <
-        ${PATCH_DIR}/python_apple.diff
-    )
   else()
-    set(PYTHON_PATCH
+    set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_unix.diff)
-      ${PATCH_CMD} --verbose -p1 -d
-        ${BUILD_DIR}/python/src/external_python <
-        ${PATCH_DIR}/python_unix.diff
-    )
   endif()
 
   # NOTE: untested on APPLE so far.
@@ -162,20 +129,9 @@ else()
     URL_HASH ${PYTHON_HASH_TYPE}=${PYTHON_HASH}
     PREFIX ${BUILD_DIR}/python
     PATCH_COMMAND ${PYTHON_PATCH}
-
+    CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}
-    CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} &&
+    BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make -j${MAKE_THREADS}
-      ${PYTHON_CONFIGURE_EXTRA_ENV} &&
+    INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
-      cd ${BUILD_DIR}/python/src/external_python/ &&
-      ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}
-
-    BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/python/src/external_python/ &&
-      make -j${MAKE_THREADS}
-
-    INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/python/src/external_python/ &&
-      make install
-
     INSTALL_DIR ${LIBDIR}/python)
 endif()
 
@@ -202,10 +158,7 @@ if(WIN32)
       # correctly to instruct it to use the debug version
       # of python. So just copy the debug imports file over
       # and call it a day...
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
-        ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib
-        ${LIBDIR}/python/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/robinmap.cmake

@@ -10,11 +10,6 @@ ExternalProject_Add(external_robinmap
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${ROBINMAP_HASH_TYPE}=${ROBINMAP_HASH}
   PREFIX ${BUILD_DIR}/robinmap
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/robinmap ${DEFAULT_CMAKE_FLAGS} ${ROBINMAP_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/robinmap
-    ${DEFAULT_CMAKE_FLAGS}
-    ${ROBINMAP_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/robinmap
 )

build_files/build_environment/cmake/sdl.cmake

@@ -2,11 +2,7 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-set(SDL_PATCH
+set(SDL_PATCH ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff)
-  ${PATCH_CMD} -p 0 -N -d
-    ${BUILD_DIR}/sdl/src/external_sdl <
-    ${PATCH_DIR}/sdl.diff
-)
 
 if(WIN32)
   set(SDL_EXTRA_ARGS
@@ -25,10 +21,7 @@ else()
     list(APPEND SDL_EXTRA_ARGS -DSDL_HAPTICS=OFF)
     set(SDL_PATCH
       ${SDL_PATCH} &&
-      ${PATCH_CMD} -p 0 -N -d
+      ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl_haptics.diff)
-        ${BUILD_DIR}/sdl/src/external_sdl <
-        ${PATCH_DIR}/sdl_haptics.diff
-    )
   endif()
 endif()
 
@@ -38,27 +31,15 @@ ExternalProject_Add(external_sdl
   URL_HASH ${SDL_HASH_TYPE}=${SDL_HASH}
   PREFIX ${BUILD_DIR}/sdl
   PATCH_COMMAND ${SDL_PATCH}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl
-    ${DEFAULT_CMAKE_FLAGS}
-    ${SDL_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/sdl
 )
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_sdl after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include
-      ${LIBDIR}/sdl/include/sdl2
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib
-      ${HARVEST_TARGET}/sdl/include
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-      ${LIBDIR}/sdl/lib
-      ${HARVEST_TARGET}/sdl/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
-      ${LIBDIR}/sdl/bin
-      ${HARVEST_TARGET}/sdl/lib
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/setup_msys2.cmake

@@ -25,10 +25,7 @@ message("msys2_LIBDIR = ${msys2_LIBDIR}")
 message("Checking for msys2 base")
 if(NOT EXISTS "${DOWNLOAD_DIR}/msys2-base-x86_64-20221028.tar.xz")
   message("Downloading msys2-base")
-  file(DOWNLOAD
+  file(DOWNLOAD "https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20221028.tar.xz" "${DOWNLOAD_DIR}/msys2-base-x86_64-20221028.tar.xz")
-    "https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20221028.tar.xz"
-    "${DOWNLOAD_DIR}/msys2-base-x86_64-20221028.tar.xz"
-  )
 endif()
 
 # Make msys2 root directory
@@ -40,8 +37,7 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/msys2")
 endif()
 
 # Extract msys2
-if((NOT EXISTS "${DOWNLOAD_DIR}/msys2/msys64/msys2_shell.cmd") AND
+if((NOT EXISTS "${DOWNLOAD_DIR}/msys2/msys64/msys2_shell.cmd") AND (EXISTS "${DOWNLOAD_DIR}/msys2-base-x86_64-20221028.tar.xz"))
-   (EXISTS "${DOWNLOAD_DIR}/msys2-base-x86_64-20221028.tar.xz"))
   message("Extracting msys2 base")
   execute_process(
     COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/msys2-base-x86_64-20221028.tar.xz
@@ -98,10 +94,7 @@ endif()
 message("Checking for nasm")
 if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
   message("Downloading nasm")
-  file(DOWNLOAD
+  file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win64/nasm-2.13.02-win64.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
-    "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win64/nasm-2.13.02-win64.zip"
-    "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"
-  )
 endif()
 
 # extract nasm
@@ -112,9 +105,7 @@ if((NOT EXISTS "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/nasm.exe") AND (EXISTS "${D
     WORKING_DIRECTORY ${DOWNLOAD_DIR}/
   )
   execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/nasm.exe"
-      "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe"
-      "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/nasm.exe"
   )
 endif()
 
@@ -122,10 +113,7 @@ message("Checking for perl")
 # download perl for libvpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.38.0.1-64bit-portable.zip")
   message("Downloading perl")
-  file(DOWNLOAD
+  file(DOWNLOAD "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.38.0.1-64bit-portable.zip")
-    "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip"
-    "${DOWNLOAD_DIR}/strawberry-perl-5.38.0.1-64bit-portable.zip"
-  )
 endif()
 
 # make perl root directory
@@ -150,27 +138,19 @@ endif()
 message("Checking for gas-preprocessor.pl")
 if(NOT EXISTS "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/gas-preprocessor.pl")
   message("Downloading gas-preprocessor.pl")
-  file(DOWNLOAD
+  file(DOWNLOAD "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/9309c67acb535ca6248f092e96131d8eb07eefc1/gas-preprocessor.pl" "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/gas-preprocessor.pl")
-    "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/9309c67acb535ca6248f092e96131d8eb07eefc1/gas-preprocessor.pl"
-    "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/gas-preprocessor.pl"
-  )
 endif()
 
 # Get ar-lib
 message("Checking for ar-lib")
 if(NOT EXISTS "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/ar-lib")
   message("Downloading ar-lib")
-  file(DOWNLOAD
+  file(DOWNLOAD "https://raw.githubusercontent.com/gcc-mirror/gcc/releases/gcc-12.2.0/ar-lib" "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/ar-lib")
-    "https://raw.githubusercontent.com/gcc-mirror/gcc/releases/gcc-12.2.0/ar-lib"
-    "${DOWNLOAD_DIR}/msys2/msys64/usr/bin/ar-lib"
-  )
 endif()
 
 if(NOT EXISTS "${DOWNLOAD_DIR}/msys2/msys64/ming64sh.cmd")
   message("Installing ming64sh.cmd")
   execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming64sh.cmd  ${DOWNLOAD_DIR}/msys2/msys64/ming64sh.cmd
-      ${PATCH_DIR}/ming64sh.cmd
-      ${DOWNLOAD_DIR}/msys2/msys64/ming64sh.cmd
   )
 endif()

build_files/build_environment/cmake/shaderc.cmake

@@ -16,12 +16,7 @@ ExternalProject_Add(external_shaderc
   URL_HASH ${SHADERC_HASH_TYPE}=${SHADERC_HASH}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/shaderc
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/shaderc ${DEFAULT_CMAKE_FLAGS} ${SHADERC_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/shaderc
-    ${DEFAULT_CMAKE_FLAGS}
-    ${SHADERC_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/shaderc
 )
 
@@ -37,28 +32,17 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_shaderc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/shaderc/include ${HARVEST_TARGET}/shaderc/include
-        ${LIBDIR}/shaderc/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/bin/shaderc_shared.dll ${HARVEST_TARGET}/shaderc/bin/shaderc_shared.dll
-        ${HARVEST_TARGET}/shaderc/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/lib/shaderc_shared.lib ${HARVEST_TARGET}/shaderc/lib/shaderc_shared.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/shaderc/bin/shaderc_shared.dll
-        ${HARVEST_TARGET}/shaderc/bin/shaderc_shared.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/shaderc/lib/shaderc_shared.lib
-        ${HARVEST_TARGET}/shaderc/lib/shaderc_shared.lib
 
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_shaderc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/bin/shaderc_shared_d.dll ${HARVEST_TARGET}/shaderc/bin/shaderc_shared_d.dll
-        ${LIBDIR}/shaderc/bin/shaderc_shared_d.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/shaderc/lib/shaderc_shared_d.lib ${HARVEST_TARGET}/shaderc/lib/shaderc_shared_d.lib
-        ${HARVEST_TARGET}/shaderc/bin/shaderc_shared_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/shaderc/lib/shaderc_shared_d.lib
-        ${HARVEST_TARGET}/shaderc/lib/shaderc_shared_d.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/sndfile.cmake

@@ -15,19 +15,9 @@ if(NOT WIN32)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${SNDFILE_HASH_TYPE}=${SNDFILE_HASH}
     PREFIX ${BUILD_DIR}/sndfile
-
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
-      cd ${BUILD_DIR}/sndfile/src/external_sndfile/ &&
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install
-      ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
-
-    BUILD_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/sndfile/src/external_sndfile/ &&
-      make -j${MAKE_THREADS}
-
-    INSTALL_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/sndfile/src/external_sndfile/ &&
-      make install
-
     INSTALL_DIR ${LIBDIR}/sndfile
   )
 else()
@@ -55,31 +45,17 @@ else()
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${SNDFILE_HASH_TYPE}=${SNDFILE_HASH}
     PREFIX ${BUILD_DIR}/sndfile
-
+    PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmake/modules/FindLame.cmake ${BUILD_DIR}/sndfile/src/external_sndfile/cmake/FindLame.cmake
-    PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sndfile ${DEFAULT_CMAKE_FLAGS} ${SNDFILE_EXTRA_ARGS}
-      ${PATCH_DIR}/cmake/modules/FindLame.cmake
-      ${BUILD_DIR}/sndfile/src/external_sndfile/cmake/FindLame.cmake
-
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sndfile
-      ${DEFAULT_CMAKE_FLAGS}
-      ${SNDFILE_EXTRA_ARGS}
-
     INSTALL_DIR ${LIBDIR}/sndfile
   )
 endif()
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
   ExternalProject_Add_Step(external_sndfile after_install
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/sndfile.dll ${HARVEST_TARGET}/sndfile/lib/sndfile.dll
-      ${LIBDIR}/sndfile/bin/sndfile.dll
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/sndfile.lib ${HARVEST_TARGET}/sndfile/lib/sndfile.lib
-      ${HARVEST_TARGET}/sndfile/lib/sndfile.dll
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/sndfile/lib/sndfile.lib
-      ${HARVEST_TARGET}/sndfile/lib/sndfile.lib
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/sndfile/include/sndfile.h
-      ${HARVEST_TARGET}/sndfile/include/sndfile.h
 
     DEPENDEES install
   )

build_files/build_environment/cmake/spnav.cmake

@@ -8,25 +8,20 @@ ExternalProject_Add(external_spnav
   URL_HASH ${SPNAV_HASH_TYPE}=${SPNAV_HASH}
   PREFIX ${BUILD_DIR}/spnav
 
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+  CONFIGURE_COMMAND
-    cd ${BUILD_DIR}/spnav/src/external_spnav/ &&
+  ${CONFIGURE_ENV} &&
-    ${CONFIGURE_COMMAND}
+  cd ${BUILD_DIR}/spnav/src/external_spnav/ &&
-      --prefix=${LIBDIR}/spnav
+  ${CONFIGURE_COMMAND}
-      # X11 is not needed as Blender polls the device as part of the GHOST event loop.
+  --prefix=${LIBDIR}/spnav
-      # This is used to support `3dxserv`, however this is no longer supported by 3DCONNEXION.
+  # X11 is not needed as Blender polls the device as part of the GHOST event loop.
-      # Disable so building without X11 is supported (WAYLAND only).
+  # This is used to support `3dxserv`, however this is no longer supported by 3DCONNEXION.
-      --disable-x11
+  # Disable so building without X11 is supported (WAYLAND only).
-      --disable-shared
+  --disable-x11
-      --enable-static
+  --disable-shared
-      --with-pic
+  --enable-static
-
+  --with-pic
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/spnav/src/external_spnav/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/spnav/src/external_spnav/ &&
-    make install
 
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make install
   INSTALL_DIR ${LIBDIR}/spnav
 )

build_files/build_environment/cmake/sqlite.cmake

@@ -32,11 +32,7 @@ if(UNIX)
 -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
 -fPIC"
   )
-  set(SQLITE_CONFIGURE_ENV
+  set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
-    ${SQLITE_CONFIGURE_ENV} &&
-    export LDFLAGS=${SQLITE_LDFLAGS} &&
-    export CFLAGS=${SQLITE_CFLAGS}
-  )
   set(SQLITE_CONFIGURATION_ARGS
     ${SQLITE_CONFIGURATION_ARGS}
     --enable-threadsafe
@@ -59,18 +55,8 @@ ExternalProject_Add(external_sqlite
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${SQLITE_HASH_TYPE}=${SQLITE_HASH}
   PREFIX ${BUILD_DIR}/sqlite
-
+  CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
-  CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} &&
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make -j${MAKE_THREADS}
-    cd ${BUILD_DIR}/sqlite/src/external_sqlite/ &&
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install
-    ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
-
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/sqlite/src/external_sqlite/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/sqlite/src/external_sqlite/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/sqlite
 )

build_files/build_environment/cmake/sse2neon.cmake

@@ -9,9 +9,6 @@ ExternalProject_Add(external_sse2neon
   PREFIX ${BUILD_DIR}/sse2neon
   CONFIGURE_COMMAND echo sse2neon - Nothing to configure
   BUILD_COMMAND echo sse2neon - nothing to build
-
+  INSTALL_COMMAND mkdir -p ${LIBDIR}/sse2neon && cp ${BUILD_DIR}/sse2neon/src/external_sse2neon/sse2neon.h ${LIBDIR}/sse2neon
-  INSTALL_COMMAND mkdir -p ${LIBDIR}/sse2neon &&
-    cp ${BUILD_DIR}/sse2neon/src/external_sse2neon/sse2neon.h ${LIBDIR}/sse2neon
-
   INSTALL_DIR ${LIBDIR}/sse2neon
 )

build_files/build_environment/cmake/ssl.cmake

@@ -35,33 +35,22 @@ else()
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
     PREFIX ${BUILD_DIR}/ssl
-
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+      --openssldir=${LIBDIR}/ssl
-      cd ${BUILD_DIR}/ssl/src/external_ssl/ &&
+      # Without this: Python will use the build directories.
-      ${SSL_CONFIGURE_COMMAND}
+      # using the system directory `/etc/ssl` might seem the obvious choice,
-        --prefix=${LIBDIR}/ssl
+      # there is no guarantee the version of SSL used with Blender is compatible with the systems,
-        --openssldir=${LIBDIR}/ssl
+      # where changes to the SSL configuration format can cause SSL not to load (see #114452).
-        # Without this: Python will use the build directories.
+      # So reference a directory known not to exist. Ideally Blender could distribute its own SSL
-        # using the system directory `/etc/ssl` might seem the obvious choice,
+      # directory, but this isn't compatible with hard coded paths.
-        # there is no guarantee the version of SSL used with Blender is compatible with the systems,
+      # See #111132 & https://github.com/openssl/openssl/issues/20185 for details.
-        # where changes to the SSL configuration format can cause SSL not to load (see #114452).
+      -DOPENSSLDIR=\\"/dev/null\\"
-        # So reference a directory known not to exist. Ideally Blender could distribute its own SSL
+      no-shared
-        # directory, but this isn't compatible with hard coded paths.
+      no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
-        # See #111132 & https://github.com/openssl/openssl/issues/20185 for details.
+      --config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
-        -DOPENSSLDIR=\\"/dev/null\\"
+      ${SSL_OS_COMPILER}
-        no-shared
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
-        no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
-        --config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
-        ${SSL_OS_COMPILER}
-
-    BUILD_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/ssl/src/external_ssl/ &&
-      make -j${MAKE_THREADS}
-
-    INSTALL_COMMAND ${CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/ssl/src/external_ssl/ &&
-      make install
-
     INSTALL_DIR ${LIBDIR}/ssl
   )
 endif()

build_files/build_environment/cmake/tbb.cmake

@@ -25,19 +25,9 @@ ExternalProject_Add(external_tbb
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${TBB_HASH_TYPE}=${TBB_HASH}
   PREFIX ${BUILD_DIR}/tbb
-
+  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
-  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy
+  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/build/version_string.ver.in &&
-    ${PATCH_DIR}/cmakelists_tbb.txt
+  ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/tbb/src/external_tbb < ${PATCH_DIR}/tbb.diff
-    ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
-
-  ${CMAKE_COMMAND} -E copy
-    ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver
-    ${BUILD_DIR}/tbb/src/external_tbb/build/version_string.ver.in &&
-
-  ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/tbb/src/external_tbb <
-    ${PATCH_DIR}/tbb.diff
-
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/tbb
 )
@@ -45,72 +35,35 @@ ExternalProject_Add(external_tbb
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_tbb after_install
-      # `findtbb.cmake` in some deps *NEEDS* to find `tbb_debug.lib` even if they are not going
+      # findtbb.cmake in some deps *NEEDS* to find tbb_debug.lib even if they are not going to use it
-      # to use it to make that test pass, we place a copy with the right name in the lib folder.
+      # to make that test pass, we place a copy with the right name in the lib folder.
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${LIBDIR}/tbb/lib/tbb_debug.lib
-        ${LIBDIR}/tbb/lib/tbb.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib
-        ${LIBDIR}/tbb/lib/tbb_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb.dll ${LIBDIR}/tbb/bin/tbb_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc.dll ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll
-        ${LIBDIR}/tbb/lib/tbbmalloc.lib
-        ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/bin/tbb.dll
-        ${LIBDIR}/tbb/bin/tbb_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/bin/tbbmalloc.dll
-        ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll
       # Normal collection of build artifacts
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
-        ${LIBDIR}/tbb/lib/tbb.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb.dll ${HARVEST_TARGET}/tbb/bin/tbb.dll
-        ${HARVEST_TARGET}/tbb/lib/tbb.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc.dll
-        ${LIBDIR}/tbb/bin/tbb.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.lib
-        ${HARVEST_TARGET}/tbb/bin/tbb.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
-        ${LIBDIR}/tbb/lib/tbbmalloc.lib
-        ${HARVEST_TARGET}/tbb/lib/tbbmalloc.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/bin/tbbmalloc.dll
-        ${HARVEST_TARGET}/tbb/bin/tbbmalloc.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib
-        ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/bin/tbbmalloc_proxy.dll
-        ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy.dll
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/tbb/include/
-        ${HARVEST_TARGET}/tbb/include/
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_tbb after_install
-      # `findtbb.cmake` in some deps *NEEDS* to find `tbb.lib` even if they are not going to use
+      # findtbb.cmake in some deps *NEEDS* to find tbb.lib even if they are not going to use it
-      # it to make that test pass, we place a copy with the right name in the lib folder.
+      # to make that test pass, we place a copy with the right name in the lib folder.
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${LIBDIR}/tbb/lib/tbb.lib
-        ${LIBDIR}/tbb/lib/tbb_debug.lib
-        ${LIBDIR}/tbb/lib/tbb.lib
       # Normal collection of build artifacts
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_debug.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
-        ${LIBDIR}/tbb/lib/tbb_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbb_debug.dll ${HARVEST_TARGET}/tbb/bin/tbb_debug.dll
-        ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy_debug.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
-        ${LIBDIR}/tbb/bin/tbb_debug.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_debug.dll
-        ${HARVEST_TARGET}/tbb/bin/tbb_debug.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/bin/tbbmalloc_proxy_debug.dll ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/lib/tbbmalloc_debug.lib
-        ${HARVEST_TARGET}/tbb/lib/tbbmalloc_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/lib/tbbmalloc_proxy_debug.lib
-        ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/bin/tbbmalloc_debug.dll
-        ${HARVEST_TARGET}/tbb/bin/tbbmalloc_debug.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/tbb/bin/tbbmalloc_proxy_debug.dll
-        ${HARVEST_TARGET}/tbb/bin/tbbmalloc_proxy_debug.dll
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/theora.cmake

@@ -14,30 +14,16 @@ if(NOT WIN32)
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${THEORA_HASH_TYPE}=${THEORA_HASH}
     PREFIX ${BUILD_DIR}/theora
-
+    PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/theora/src/external_theora < ${PATCH_DIR}/theora.diff
-    PATCH_COMMAND ${PATCH_CMD} -p 0 -d
+    CONFIGURE_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora
-      ${BUILD_DIR}/theora/src/external_theora <
+      --disable-shared
-      ${PATCH_DIR}/theora.diff
+      --enable-static
-
+      --with-pic
-    CONFIGURE_COMMAND ${THEORA_CONFIGURE_ENV} &&
+      --with-ogg=${LIBDIR}/ogg
-      cd ${BUILD_DIR}/theora/src/external_theora/ &&
+      --with-vorbis=${LIBDIR}/vorbis
-      ${CONFIGURE_COMMAND}
+      --disable-examples
-        --prefix=${LIBDIR}/theora
+    BUILD_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
-        --disable-shared
+    INSTALL_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make install
-        --enable-static
-        --with-pic
-        --with-ogg=${LIBDIR}/ogg
-        --with-vorbis=${LIBDIR}/vorbis
-        --disable-examples
-
-    BUILD_COMMAND ${THEORA_CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/theora/src/external_theora/ &&
-      make -j${MAKE_THREADS}
-
-    INSTALL_COMMAND ${THEORA_CONFIGURE_ENV} &&
-      cd ${BUILD_DIR}/theora/src/external_theora/ &&
-      make install
-
     INSTALL_DIR ${LIBDIR}/theora
   )
 else()
@@ -47,24 +33,10 @@ else()
     DOWNLOAD_DIR ${DOWNLOAD_DIR}
     URL_HASH ${THEORA_HASH_TYPE}=${THEORA_HASH}
     PREFIX ${BUILD_DIR}/theora
-
+    PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_theora.txt ${BUILD_DIR}/theora/src/external_theora/CMakeLists.txt &&
-    PATCH_COMMAND COMMAND
+                          ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/libtheora.def ${BUILD_DIR}/theora/src/external_theora/libtheora.def &&
-      ${CMAKE_COMMAND} -E copy
+                          ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/vorbis/src/external_vorbis/cmake/FindOgg.cmake ${BUILD_DIR}/theora/src/external_theora/FindOgg.cmake
-        ${PATCH_DIR}/cmakelists_theora.txt
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/theora -DOGG_ROOT=${LIBDIR}/ogg ${DEFAULT_CMAKE_FLAGS} -DLIBDIR=${LIBDIR}
-        ${BUILD_DIR}/theora/src/external_theora/CMakeLists.txt &&
-      ${CMAKE_COMMAND} -E copy
-        ${PATCH_DIR}/libtheora.def
-        ${BUILD_DIR}/theora/src/external_theora/libtheora.def &&
-      ${CMAKE_COMMAND} -E copy
-        ${BUILD_DIR}/vorbis/src/external_vorbis/cmake/FindOgg.cmake
-        ${BUILD_DIR}/theora/src/external_theora/FindOgg.cmake
-
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${LIBDIR}/theora
-      -DOGG_ROOT=${LIBDIR}/ogg
-      ${DEFAULT_CMAKE_FLAGS}
-      -DLIBDIR=${LIBDIR}
-
     INSTALL_DIR ${LIBDIR}/theora
   )
 endif()

build_files/build_environment/cmake/tiff.cmake

@@ -22,12 +22,7 @@ ExternalProject_Add(external_tiff
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${TIFF_HASH_TYPE}=${TIFF_HASH}
   PREFIX ${BUILD_DIR}/tiff
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff ${DEFAULT_CMAKE_FLAGS} ${TIFF_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff
-    ${DEFAULT_CMAKE_FLAGS}
-    ${TIFF_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/tiff
 )
 
@@ -39,13 +34,8 @@ add_dependencies(
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_tiff after_install
-      COMMAND
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
-        ${CMAKE_COMMAND} -E copy
+              ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/
-          ${LIBDIR}/tiff/lib/tiff.lib
-          ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
-        ${CMAKE_COMMAND} -E copy_directory
-          ${LIBDIR}/tiff/include/
-          ${HARVEST_TARGET}/tiff/include/
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/usd.cmake

@@ -111,21 +111,9 @@ ExternalProject_Add(external_usd
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
   PREFIX ${BUILD_DIR}/usd
   LIST_SEPARATOR ^^
-
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd.diff &&
-  PATCH_COMMAND
+                ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd_core_profile.diff
-    ${PATCH_CMD} -p 1 -d
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${USD_EXTRA_ARGS}
-      ${BUILD_DIR}/usd/src/external_usd <
-      ${PATCH_DIR}/usd.diff &&
-  ${PATCH_CMD} -p 1 -d
-    ${BUILD_DIR}/usd/src/external_usd <
-    ${PATCH_DIR}/usd_core_profile.diff
-
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd
-    -Wno-dev
-    ${DEFAULT_CMAKE_FLAGS}
-    ${USD_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/usd
 )
 
@@ -140,8 +128,7 @@ add_dependencies(
   openvdb
 )
 
-# Since USD 21.11 the libraries are prefixed with "usd_",
+# Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a".
-# i.e. "libusd_m.a" became "libusd_usd_m.a".
 # See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
 if(NOT WIN32)
   if(USD_VERSION VERSION_LESS 21.11)
@@ -154,24 +141,15 @@ endif()
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd ${HARVEST_TARGET}/usd
-        ${LIBDIR}/usd
-        ${HARVEST_TARGET}/usd
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib/python ${HARVEST_TARGET}/usd/lib/debug/python
-        ${LIBDIR}/usd/lib/python
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_ms_d.dll ${HARVEST_TARGET}/usd/lib/usd_ms_d.dll
-        ${HARVEST_TARGET}/usd/lib/debug/python
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_ms_d.lib ${HARVEST_TARGET}/usd/lib/usd_ms_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/usd/lib/usd_ms_d.dll
-        ${HARVEST_TARGET}/usd/lib/usd_ms_d.dll
-      COMMAND ${CMAKE_COMMAND} -E copy
-        ${LIBDIR}/usd/lib/usd_ms_d.lib
-        ${HARVEST_TARGET}/usd/lib/usd_ms_d.lib
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/versions.cmake

@@ -639,10 +639,10 @@ set(BROTLI_HASH_TYPE SHA256)
 set(BROTLI_FILE brotli-v${BROTLI_VERSION}.tar.gz)
 set(BROTLI_CPE "cpe:2.3:a:google:brotli:${BROTLI_VERSION}:*:*:*:*:*:*:*")
 
-set(OPENPGL_VERSION v0.6.0)
+set(OPENPGL_VERSION v0.5.0)
-set(OPENPGL_SHORT_VERSION 0.6.0)
+set(OPENPGL_SHORT_VERSION 0.5.0)
 set(OPENPGL_URI https://github.com/OpenPathGuidingLibrary/openpgl/archive/refs/tags/${OPENPGL_VERSION}.tar.gz)
-set(OPENPGL_HASH 4192a4096ee3e3d31878cd013f8de23418c8037c576537551f946c4811931c5e)
+set(OPENPGL_HASH 1ec806d434d45e43e098f82ee9be0cb74928343898c57490b34ff80584e9805a)
 set(OPENPGL_HASH_TYPE SHA256)
 set(OPENPGL_FILE openpgl-${OPENPGL_VERSION}.tar.gz)
 

build_files/build_environment/cmake/vorbis.cmake

@@ -3,18 +3,13 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 ExternalProject_Add(external_vorbis
-  URL file://${PACKAGE_DIR}/${VORBIS_FILE}
+    URL file://${PACKAGE_DIR}/${VORBIS_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${VORBIS_HASH_TYPE}=${VORBIS_HASH}
+    URL_HASH ${VORBIS_HASH_TYPE}=${VORBIS_HASH}
-  PREFIX ${BUILD_DIR}/vorbis
+    PREFIX ${BUILD_DIR}/vorbis
-
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vorbis -DOGG_ROOT=${LIBDIR}/ogg ${DEFAULT_CMAKE_FLAGS}
-  CMAKE_ARGS
+    INSTALL_DIR ${LIBDIR}/vorbis
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vorbis
+  )
-    -DOGG_ROOT=${LIBDIR}/ogg
-    ${DEFAULT_CMAKE_FLAGS}
-
-  INSTALL_DIR ${LIBDIR}/vorbis
-)
 
 add_dependencies(
   external_vorbis

build_files/build_environment/cmake/vpx.cmake

@@ -9,11 +9,7 @@ if(WIN32)
   # layer using win32 threads. So all this patch does is make it not find
   # pthead.h
 
-  set(VPX_PATCH
+  set(VPX_PATCH ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/vpx/src/external_vpx < ${PATCH_DIR}/vpx_windows.diff)
-    ${PATCH_CMD} -p 1 -d
-      ${BUILD_DIR}/vpx/src/external_vpx <
-      ${PATCH_DIR}/vpx_windows.diff
-  )
 
   if(MSVC_VERSION GREATER_EQUAL 1920) # 2019
     set(VPX_COMPILER_STRING vs16)
@@ -34,23 +30,10 @@ if(WIN32)
 
   set(VPX_INCLUDE_PATH ${BUILD_DIR}/vpx/src/external_vpx/vpx-vp8-vp9-${VPX_INCL_ARCH}md-${VPX_COMPILER_STRING}-v${VPX_VERSION})
 
-  set(VPX_BUILD_COMMAND
+  set(VPX_BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make dist && msbuild /m vpx.sln /p:OutDir=${BUILD_DIR}/vpx/src/external_vpx-build/ /p:Configuration=Release)
-    ${CONFIGURE_ENV} &&
+  set(VPX_INSTALL_COMMAND ${CONFIGURE_ENV} && ${CMAKE_COMMAND} -E copy_directory ${VPX_INCLUDE_PATH}/include ${LIBDIR}/vpx/include &&
-    cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
+                          ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/vpx/src/external_vpx-build/ ${LIBDIR}/vpx/lib/ &&
-    make dist &&
+                          ${CMAKE_COMMAND} -E copy ${LIBDIR}/vpx/lib/vpxmd.lib ${LIBDIR}/vpx/lib/vpx.lib)
-    msbuild /m vpx.sln /p:OutDir=${BUILD_DIR}/vpx/src/external_vpx-build/ /p:Configuration=Release
-  )
-  set(VPX_INSTALL_COMMAND
-    ${CONFIGURE_ENV} &&
-    ${CMAKE_COMMAND} -E copy_directory
-      ${VPX_INCLUDE_PATH}/include
-      ${LIBDIR}/vpx/include &&
-    ${CMAKE_COMMAND} -E copy_directory
-      ${BUILD_DIR}/vpx/src/external_vpx-build/
-      ${LIBDIR}/vpx/lib/ &&
-    ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/vpx/lib/vpxmd.lib
-      ${LIBDIR}/vpx/lib/vpx.lib)
 else()
   if(APPLE)
     if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
@@ -64,14 +47,8 @@ else()
 
   set(VPX_CONFIGURE_COMMAND ${CONFIGURE_ENV})
 
-  set(VPX_BUILD_COMMAND ${CONFIGURE_ENV} &&
+  set(VPX_BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS})
-    cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
+  set(VPX_INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install)
-    make -j${MAKE_THREADS}
-  )
-  set(VPX_INSTALL_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
-    make install
-  )
 endif()
 
 if(NOT BLENDER_PLATFORM_ARM)
@@ -89,7 +66,6 @@ ExternalProject_Add(external_vpx
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${VPX_HASH_TYPE}=${VPX_HASH}
   PREFIX ${BUILD_DIR}/vpx
-
   CONFIGURE_COMMAND ${VPX_CONFIGURE_COMMAND} &&
     cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
     ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx
@@ -102,7 +78,6 @@ ExternalProject_Add(external_vpx
       --enable-vp8
       --enable-vp9
       ${VPX_EXTRA_FLAGS}
-
   BUILD_COMMAND ${VPX_BUILD_COMMAND}
   INSTALL_COMMAND ${VPX_INSTALL_COMMAND}
   PATCH_COMMAND ${VPX_PATCH}

build_files/build_environment/cmake/vulkan.cmake

@@ -8,12 +8,7 @@ ExternalProject_Add(external_vulkan_headers
   URL file://${PACKAGE_DIR}/${VULKAN_HEADERS_FILE}
   URL_HASH ${VULKAN_HEADERS_HASH_TYPE}=${VULKAN_HEADERS_HASH}
   PREFIX ${BUILD_DIR}/vulkan_headers
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vulkan_headers -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${VULKAN_HEADERS_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vulkan_headers
-    -Wno-dev ${DEFAULT_CMAKE_FLAGS}
-    ${VULKAN_HEADERS_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/vulkan_headers
 )
 
@@ -36,13 +31,7 @@ ExternalProject_Add(external_vulkan_loader
   URL file://${PACKAGE_DIR}/${VULKAN_LOADER_FILE}
   URL_HASH ${VULKAN_LOADER_HASH_TYPE}=${VULKAN_LOADER_HASH}
   PREFIX ${BUILD_DIR}/vulkan_loader
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vulkan_loader -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${VULKAN_LOADER_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/vulkan_loader
-    -Wno-dev
-    ${DEFAULT_CMAKE_FLAGS}
-    ${VULKAN_LOADER_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/vulkan_loader
 )
 
@@ -59,12 +48,8 @@ if(UNIX AND NOT APPLE)
 elseif(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_vulkan_loader after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/vulkan_loader/ ${HARVEST_TARGET}/vulkan
-        ${LIBDIR}/vulkan_loader/
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/vulkan_headers/ ${HARVEST_TARGET}/vulkan
-        ${HARVEST_TARGET}/vulkan
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/vulkan_headers/
-        ${HARVEST_TARGET}/vulkan
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/wayland.cmake

@@ -7,7 +7,6 @@ ExternalProject_Add(external_wayland
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${WAYLAND_HASH_TYPE}=${WAYLAND_HASH}
   PREFIX ${BUILD_DIR}/wayland
-
   # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own LIBEXPAT & LIBXML2.
   #
   # NOTE: passing link args "ffi/lib" should not be needed, but
@@ -15,18 +14,8 @@ ExternalProject_Add(external_wayland
   #
   # NOTE: `-lm` is needed for `libxml2` which is a static library that uses `libm.so`,
   # without this, math symbols such as `floor` aren't found.
-  CONFIGURE_COMMAND
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig:${LIBDIR}/xml2/lib/pkgconfig:${LIBDIR}/ffi/lib/pkgconfig:$PKG_CONFIG_PATH
-    ${CMAKE_COMMAND} -E env
+                    ${MESON} --prefix ${LIBDIR}/wayland ${MESON_BUILD_TYPE} -Ddocumentation=false -Dtests=false -D "c_link_args=-L${LIBDIR}/ffi/lib -lm" . ../external_wayland
-      PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig:${LIBDIR}/xml2/lib/pkgconfig:${LIBDIR}/ffi/lib/pkgconfig:$PKG_CONFIG_PATH
-    ${MESON}
-      --prefix ${LIBDIR}/wayland
-      ${MESON_BUILD_TYPE}
-      -Ddocumentation=false
-      -Dtests=false
-      -D "c_link_args=-L${LIBDIR}/ffi/lib -lm"
-      .
-      ../external_wayland
-
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )

build_files/build_environment/cmake/wayland_libdecor.cmake

@@ -12,10 +12,6 @@ ExternalProject_Add(external_wayland_libdecor
   PREFIX ${BUILD_DIR}/wayland_libdecor
   BUILD_COMMAND echo .
   CONFIGURE_COMMAND echo .
-
+  INSTALL_COMMAND cp ../external_wayland_libdecor/src/libdecor.h ${LIBDIR}/wayland_libdecor/include/libdecor-0/libdecor.h
-  INSTALL_COMMAND cp
-    ../external_wayland_libdecor/src/libdecor.h
-    ${LIBDIR}/wayland_libdecor/include/libdecor-0/libdecor.h
-
   INSTALL_DIR ${LIBDIR}/wayland_libdecor/include/libdecor-0
 )

build_files/build_environment/cmake/wayland_protocols.cmake

@@ -8,16 +8,8 @@ ExternalProject_Add(external_wayland_protocols
   URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH}
   PREFIX ${BUILD_DIR}/wayland-protocols
   # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own WAYLAND.
-
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/wayland/lib64/pkgconfig:$PKG_CONFIG_PATH
-  CONFIGURE_COMMAND ${CMAKE_COMMAND} -E
+                    ${MESON} --prefix ${LIBDIR}/wayland-protocols ${MESON_BUILD_TYPE} . ../external_wayland_protocols -Dtests=false
-    env PKG_CONFIG_PATH=${LIBDIR}/wayland/lib64/pkgconfig:$PKG_CONFIG_PATH
-    ${MESON}
-      --prefix ${LIBDIR}/wayland-protocols
-      ${MESON_BUILD_TYPE}
-      .
-      ../external_wayland_protocols
-      -Dtests=false
-
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )

build_files/build_environment/cmake/wayland_weston.cmake

@@ -20,35 +20,36 @@ ExternalProject_Add(external_wayland_weston
   # - Keep X11 and WAYLAND back-ends enabled so it's possible
   #   to run the instance inside existing X11/WAYLAND sessions (for debugging).
   CONFIGURE_COMMAND ${WAYLAND_WESTON_CONFIGURE_ENV} &&
-    ${CMAKE_COMMAND} -E env ${WAYLAND_WESTON_PKG_ENV} ${MESON} setup
+  ${CMAKE_COMMAND} -E env ${WAYLAND_WESTON_PKG_ENV}
-      ${MESON_BUILD_TYPE}
+  ${MESON} setup
-      --prefix ${LIBDIR}/wayland_weston
+  ${MESON_BUILD_TYPE}
-      --libdir lib
+  --prefix ${LIBDIR}/wayland_weston
-      -Dbackend-default=headless  # For tests.
+  --libdir lib
-      -Dbackend-drm-screencast-vaapi=false
+  -Dbackend-default=headless  # For tests.
-      -Dbackend-drm=false
+  -Dbackend-drm-screencast-vaapi=false
-      -Dbackend-pipewire=false
+  -Dbackend-drm=false
-      -Dbackend-rdp=false
+  -Dbackend-pipewire=false
-      -Dbackend-vnc=false
+  -Dbackend-rdp=false
-      -Dcolor-management-lcms=false
+  -Dbackend-vnc=false
-      -Ddemo-clients=false
+  -Dcolor-management-lcms=false
-      -Ddoc=false
+  -Ddemo-clients=false
-      -Dimage-jpeg=false
+  -Ddoc=false
-      -Dimage-webp=false
+  -Dimage-jpeg=false
-      -Dpipewire=false
+  -Dimage-webp=false
-      -Dremoting=false
+  -Dpipewire=false
-      -Dscreenshare=false
+  -Dremoting=false
-      -Dshell-fullscreen=false
+  -Dscreenshare=false
-      -Dshell-ivi=false
+  -Dshell-fullscreen=false
-      -Dshell-kiosk=false
+  -Dshell-ivi=false
-      -Dsimple-clients=
+  -Dshell-kiosk=false
-      -Dsystemd=false
+  -Dsimple-clients=
-      -Dtest-junit-xml=false
+  -Dsystemd=false
-      -Dtools=
+  -Dtest-junit-xml=false
-      -Dwcap-decode=false
+  -Dtools=
-      -Dxwayland=false
+  -Dwcap-decode=false
-      ${BUILD_DIR}/wayland_weston/src/external_wayland_weston-build
+  -Dxwayland=false
-      ${BUILD_DIR}/wayland_weston/src/external_wayland_weston
+  ${BUILD_DIR}/wayland_weston/src/external_wayland_weston-build
+  ${BUILD_DIR}/wayland_weston/src/external_wayland_weston
 
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install

build_files/build_environment/cmake/webp.cmake

@@ -28,23 +28,14 @@ ExternalProject_Add(external_webp
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${WEBP_HASH_TYPE}=${WEBP_HASH}
   PREFIX ${BUILD_DIR}/webp
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp
-    -Wno-dev
-    ${DEFAULT_CMAKE_FLAGS}
-    ${WEBP_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/webp
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_webp after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp
-        ${LIBDIR}/webp
-        ${HARVEST_TARGET}/webp
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/x264.cmake

@@ -11,8 +11,8 @@ if(BLENDER_PLATFORM_ARM)
 endif()
 
 if((APPLE AND NOT BLENDER_PLATFORM_ARM) OR (UNIX AND NOT APPLE))
-  set(X264_CONFIGURE_ENV ${CONFIGURE_ENV} &&
+  set(X264_CONFIGURE_ENV
-    export AS=${LIBDIR}/nasm/bin/nasm
+    ${CONFIGURE_ENV} && export AS=${LIBDIR}/nasm/bin/nasm
   )
 elseif(WIN32)
   set(X264_CONFIGURE_ENV ${CONFIGURE_ENV_NO_PERL})
@@ -25,23 +25,14 @@ ExternalProject_Add(external_x264
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${X264_HASH_TYPE}=${X264_HASH}
   PREFIX ${BUILD_DIR}/x264
-
+  CONFIGURE_COMMAND ${X264_CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ &&
-  CONFIGURE_COMMAND ${X264_CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/x264/src/external_x264/ &&
     ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
-      --enable-static
+    --enable-static
-      --enable-pic
+    --enable-pic
-      --disable-lavf
+    --disable-lavf
-      ${X264_EXTRA_ARGS}
+    ${X264_EXTRA_ARGS}
-
+  BUILD_COMMAND ${X264_CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
-  BUILD_COMMAND ${X264_CONFIGURE_ENV} &&
+  INSTALL_COMMAND ${X264_CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
-    cd ${BUILD_DIR}/x264/src/external_x264/ &&
-    make -j${MAKE_THREADS}
-
-  INSTALL_COMMAND ${X264_CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/x264/src/external_x264/ &&
-    make install
-
   INSTALL_DIR ${LIBDIR}/x264
 )
 

build_files/build_environment/cmake/xml2.cmake

@@ -15,25 +15,15 @@ ExternalProject_Add(external_xml2
   URL file://${PACKAGE_DIR}/${XML2_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${XML2_HASH_TYPE}=${XML2_HASH}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xml2 ${DEFAULT_CMAKE_FLAGS} ${XML2_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xml2
-    ${DEFAULT_CMAKE_FLAGS}
-    ${XML2_EXTRA_ARGS}
-
   PREFIX ${BUILD_DIR}/xml2
   INSTALL_DIR ${LIBDIR}/xml2
 )
 
 if(WIN32 AND BUILD_MODE STREQUAL Release)
   ExternalProject_Add_Step(external_xml2 after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xml2/include  ${HARVEST_TARGET}/xml2/include
-      ${LIBDIR}/xml2/include
+        COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xml2/lib/libxml2s.lib  ${HARVEST_TARGET}/xml2/lib/libxml2s.lib
-      ${HARVEST_TARGET}/xml2/include
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${LIBDIR}/xml2/lib/libxml2s.lib
-      ${HARVEST_TARGET}/xml2/lib/libxml2s.lib
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/xr_openxr.cmake

@@ -25,34 +25,21 @@ ExternalProject_Add(external_xr_openxr_sdk
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${XR_OPENXR_SDK_HASH_TYPE}=${XR_OPENXR_SDK_HASH}
   PREFIX ${BUILD_DIR}/xr_openxr_sdk
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xr_openxr_sdk ${DEFAULT_CMAKE_FLAGS} ${XR_OPENXR_SDK_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xr_openxr_sdk
-    ${DEFAULT_CMAKE_FLAGS}
-    ${XR_OPENXR_SDK_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/xr_openxr_sdk
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_xr_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xr_openxr_sdk/include/openxr ${HARVEST_TARGET}/xr_openxr_sdk/include/openxr
-        ${LIBDIR}/xr_openxr_sdk/include/openxr
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xr_openxr_sdk/lib ${HARVEST_TARGET}/xr_openxr_sdk/lib
-        ${HARVEST_TARGET}/xr_openxr_sdk/include/openxr
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/xr_openxr_sdk/lib
-        ${HARVEST_TARGET}/xr_openxr_sdk/lib
-
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_xr_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xr_openxr_sdk/lib/openxr_loaderd.lib ${HARVEST_TARGET}/xr_openxr_sdk/lib/openxr_loaderd.lib
-        ${LIBDIR}/xr_openxr_sdk/lib/openxr_loaderd.lib
-        ${HARVEST_TARGET}/xr_openxr_sdk/lib/openxr_loaderd.lib
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/cmake/yamlcpp.cmake

@@ -22,11 +22,6 @@ ExternalProject_Add(external_yamlcpp
   URL_HASH ${YAMLCPP_HASH_TYPE}=${YAMLCPP_HASH}
   PREFIX ${BUILD_DIR}/yamlcpp
   CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp
-    ${DEFAULT_CMAKE_FLAGS}
-    ${YAMLCPP_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/yamlcpp
 )

build_files/build_environment/cmake/zlib.cmake

@@ -3,11 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 if(MSVC)
-  set(ZLIB_PATCH_COMMAND
+  set(ZLIB_PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/zlib/src/external_zlib < ${PATCH_DIR}/zlib.diff)
-    ${PATCH_CMD} -p 1 -d
-      ${BUILD_DIR}/zlib/src/external_zlib <
-      ${PATCH_DIR}/zlib.diff
-  )
 else()
   set(ZLIB_PATCH_COMMAND echo .)
 endif()
@@ -17,37 +13,24 @@ ExternalProject_Add(external_zlib
   URL_HASH ${ZLIB_HASH_TYPE}=${ZLIB_HASH}
   PREFIX ${BUILD_DIR}/zlib
   PATCH_COMMAND ${ZLIB_PATCH_COMMAND}
-
+  CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
-  CMAKE_ARGS
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib
-    ${DEFAULT_CMAKE_FLAGS}
-
   INSTALL_DIR ${LIBDIR}/zlib
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_zlib after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
-        ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT}
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/
-        ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/zlib/include/
-        ${HARVEST_TARGET}/zlib/include/
       COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/zlib/bin/zlib.dll
       COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/zlib/lib/zlib.lib
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${LIBDIR}/zlib/lib/zlib${LIBEXT}
-        ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT}
-        ${LIBDIR}/zlib/lib/zlib${LIBEXT}
       DEPENDEES install
     )
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_zlib after_install
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT}
-      ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT}
-      ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT}
     COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/zlib/bin/zlib.dll
     COMMAND ${CMAKE_COMMAND} -E rm -f ${LIBDIR}/zlib/lib/zlib.lib
     DEPENDEES install
@@ -55,10 +38,7 @@ if(WIN32)
   endif()
 else()
   ExternalProject_Add_Step(external_zlib after_install
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
-      ${LIBDIR}/zlib/lib/libz.a
-      ${LIBDIR}/zlib/lib/libz_pic.a
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/zlib_mingw.cmake

@@ -8,21 +8,14 @@ ExternalProject_Add(external_zlib_mingw
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   PREFIX ${BUILD_DIR}/zlib_mingw
   CONFIGURE_COMMAND echo .
-
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/ && make -f win32/makefile.gcc -j${MAKE_THREADS}
-  BUILD_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/ &&
-    make -f win32/makefile.gcc -j${MAKE_THREADS}
-
   INSTALL_COMMAND echo .
   INSTALL_DIR ${LIBDIR}/zlib_mingw
 )
 
 if(BUILD_MODE STREQUAL Release)
   ExternalProject_Add_Step(external_zlib_mingw after_install
-    COMMAND ${CMAKE_COMMAND} -E copy
+    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/libz.a ${LIBDIR}/zlib/lib/z.lib
-      ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/libz.a
-      ${LIBDIR}/zlib/lib/z.lib
-
     DEPENDEES install
   )
 endif()

build_files/build_environment/cmake/zstd.cmake

@@ -22,25 +22,15 @@ ExternalProject_Add(external_zstd
   URL_HASH ${ZSTD_HASH_TYPE}=${ZSTD_HASH}
   PREFIX ${BUILD_DIR}/zstd
   SOURCE_SUBDIR build/cmake
-
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zstd ${DEFAULT_CMAKE_FLAGS} ${ZSTD_EXTRA_ARGS}
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zstd
-    ${DEFAULT_CMAKE_FLAGS}
-    ${ZSTD_EXTRA_ARGS}
-
   INSTALL_DIR ${LIBDIR}/zstd
 )
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)
     ExternalProject_Add_Step(external_zstd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zstd/lib/zstd_static${LIBEXT} ${HARVEST_TARGET}/zstd/lib/zstd_static${LIBEXT}
-        ${LIBDIR}/zstd/lib/zstd_static${LIBEXT}
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zstd/include/ ${HARVEST_TARGET}/zstd/include/
-        ${HARVEST_TARGET}/zstd/lib/zstd_static${LIBEXT}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory
-        ${LIBDIR}/zstd/include/
-        ${HARVEST_TARGET}/zstd/include/
-
       DEPENDEES install
     )
   endif()

build_files/build_environment/install_linux_packages.py

@@ -899,7 +899,7 @@ PACKAGES_ALL = (
                                   DISTRO_ID_ARCH: "level-zero-headers",  # ???
                                   },
             ),
-    Package(name="OpenPGL Library", is_mandatory=False, version="0.6.0", version_short="0.6", version_min="0.5.0", version_mex="0.7",
+    Package(name="OpenPGL Library", is_mandatory=False, version="0.5.0", version_short="0.5", version_min="0.5.0", version_mex="0.6",
             sub_packages=(),
             distro_package_names={DISTRO_ID_DEBIAN: None,
                                   DISTRO_ID_FEDORA: "openpgl-devel",

build_files/cmake/macros.cmake

@@ -849,7 +849,7 @@ function(get_blender_version)
   # - BLENDER_VERSION_PATCH
   # - BLENDER_VERSION_CYCLE (alpha, beta, rc, release)
 
-  # So CMAKE depends on `BKE_blender_version.h`, beware of infinite-loops!
+  # So CMAKE depends on `BKE_blender.h`, beware of infinite-loops!
   configure_file(
     ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender_version.h
     ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender_version.h.done

build_files/utils/make_source_archive.py

@@ -8,7 +8,6 @@ import make_utils
 import os
 import re
 import subprocess
-import sys
 from pathlib import Path
 from typing import Iterable, TextIO, Optional, Any, Union
 
@@ -177,14 +176,9 @@ def create_tarball(
     packages_dir: Optional[Path],
 ) -> None:
     print(f'Creating archive:            "{tarball}" ...', end="", flush=True)
+    command = ["tar"]
 
     # Requires GNU `tar`, since `--transform` is used.
-    if sys.platform == "darwin":
-        # Provided by `brew install gnu-tar`.
-        command = ["gtar"]
-    else:
-        command = ["tar"]
-
     if packages_dir:
         command += ["--transform", f"s,{packages_dir}/,packages/,g"]
 

build_files/windows/doc_py.cmd

@@ -26,7 +26,7 @@ exit /b 1
 :detect_blender_done
 
 %BLENDER_BIN% ^
-	--background --factory-startup ^
+	--background -noaudio --factory-startup ^
 	--python %BLENDER_DIR%/doc/python_api/sphinx_doc_gen.py
 
 "%SPHINX_BIN%" -b html %SPHINXOPTS% %O% %SOURCEDIR% %BUILDDIR%