diff --git a/etc/SuperBuild/cmake/Modules/BuildCURL.cmake b/etc/SuperBuild/cmake/Modules/BuildCURL.cmake index aa5b3bb6..a8236a7c 100644 --- a/etc/SuperBuild/cmake/Modules/BuildCURL.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildCURL.cmake @@ -16,6 +16,6 @@ ExternalProject_Add( DEPENDS Libssh2 ${OpenSSL} ZLIB GIT_REPOSITORY ${CURL_GIT_REPOSITORY} GIT_TAG ${CURL_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${CURL_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildFreetype.cmake b/etc/SuperBuild/cmake/Modules/BuildFreetype.cmake index 01144550..6ad30b1d 100644 --- a/etc/SuperBuild/cmake/Modules/BuildFreetype.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildFreetype.cmake @@ -18,6 +18,6 @@ ExternalProject_Add( DEPENDS ZLIB GIT_REPOSITORY ${Freetype_GIT_REPOSITORY} GIT_TAG ${Freetype_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${Freetype_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildImath.cmake b/etc/SuperBuild/cmake/Modules/BuildImath.cmake index 039e5a2b..b40d90f5 100644 --- a/etc/SuperBuild/cmake/Modules/BuildImath.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildImath.cmake @@ -12,6 +12,6 @@ ExternalProject_Add( PREFIX ${CMAKE_CURRENT_BINARY_DIR}/Imath GIT_REPOSITORY ${Imath_GIT_REPOSITORY} GIT_TAG ${Imath_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${Imath_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildLCMS2.cmake b/etc/SuperBuild/cmake/Modules/BuildLCMS2.cmake index 3fcecc09..dc0d272c 100644 --- a/etc/SuperBuild/cmake/Modules/BuildLCMS2.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildLCMS2.cmake @@ -26,7 +26,7 @@ else() PREFIX ${CMAKE_CURRENT_BINARY_DIR}/LCMS2 GIT_REPOSITORY "https://github.com/mm2/Little-CMS.git" GIT_TAG lcms2.15 - + GIT_SHALLOW 1 GIT_PROGRESS 1 CONFIGURE_COMMAND ${LCMS2_BUILD_COMMAND} BUILD_IN_SOURCE 1) diff --git a/etc/SuperBuild/cmake/Modules/BuildLibssh2.cmake b/etc/SuperBuild/cmake/Modules/BuildLibssh2.cmake index 6b17b6c2..8ad9acca 100644 --- a/etc/SuperBuild/cmake/Modules/BuildLibssh2.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildLibssh2.cmake @@ -15,7 +15,7 @@ ExternalProject_Add( DEPENDS ${OpenSSL} ZLIB GIT_REPOSITORY ${Libssh2_GIT_REPOSITORY} GIT_TAG ${Libssh2_GIT_TAG} - + GIT_SHALLOW 1 PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/Libssh2-patch/CMakeLists.txt ${CMAKE_CURRENT_BINARY_DIR}/Libssh2/src/Libssh2/CMakeLists.txt diff --git a/etc/SuperBuild/cmake/Modules/BuildOTIO.cmake b/etc/SuperBuild/cmake/Modules/BuildOTIO.cmake index 6d2f7755..557ac84c 100644 --- a/etc/SuperBuild/cmake/Modules/BuildOTIO.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildOTIO.cmake @@ -21,6 +21,6 @@ ExternalProject_Add( DEPENDS Imath GIT_REPOSITORY ${OTIO_GIT_REPOSITORY} GIT_TAG ${OTIO_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${OTIO_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildOpenColorIO.cmake b/etc/SuperBuild/cmake/Modules/BuildOpenColorIO.cmake index e5a74d3f..6ebc6197 100644 --- a/etc/SuperBuild/cmake/Modules/BuildOpenColorIO.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildOpenColorIO.cmake @@ -28,6 +28,6 @@ ExternalProject_Add( DEPENDS Imath yaml-cpp expat pystring minizip-ng ZLIB GIT_REPOSITORY ${OpenColorIO_GIT_REPOSITORY} GIT_TAG ${OpenColorIO_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${OpenColorIO_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildOpenEXR.cmake b/etc/SuperBuild/cmake/Modules/BuildOpenEXR.cmake index 30b40926..fedc9fc1 100644 --- a/etc/SuperBuild/cmake/Modules/BuildOpenEXR.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildOpenEXR.cmake @@ -20,6 +20,6 @@ ExternalProject_Add( DEPENDS Imath ZLIB GIT_REPOSITORY ${OpenEXR_GIT_REPOSITORY} GIT_TAG ${OpenEXR_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${OpenEXR_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildPNG.cmake b/etc/SuperBuild/cmake/Modules/BuildPNG.cmake index ccce7363..55de1dff 100644 --- a/etc/SuperBuild/cmake/Modules/BuildPNG.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildPNG.cmake @@ -27,6 +27,6 @@ ExternalProject_Add( DEPENDS ZLIB GIT_REPOSITORY ${PNG_GIT_REPOSITORY} GIT_TAG ${PNG_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${PNG_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildSampleRate.cmake b/etc/SuperBuild/cmake/Modules/BuildSampleRate.cmake index 2e87bc9a..d85e33fa 100644 --- a/etc/SuperBuild/cmake/Modules/BuildSampleRate.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildSampleRate.cmake @@ -13,6 +13,6 @@ ExternalProject_Add( PREFIX ${CMAKE_CURRENT_BINARY_DIR}/SampleRate GIT_REPOSITORY ${SampleRate_GIT_REPOSITORY} GIT_TAG ${SampleRate_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${SampleRate_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildSvtAV1.cmake b/etc/SuperBuild/cmake/Modules/BuildSvtAV1.cmake index 663deac0..1c95fa24 100644 --- a/etc/SuperBuild/cmake/Modules/BuildSvtAV1.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildSvtAV1.cmake @@ -17,7 +17,7 @@ ExternalProject_Add( DEPENDS NASM GIT_REPOSITORY "https://gitlab.com/AOMediaCodec/SVT-AV1.git" GIT_TAG ${SvtAV1_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${SvtAV1_ARGS} ) diff --git a/etc/SuperBuild/cmake/Modules/BuildTIFF.cmake b/etc/SuperBuild/cmake/Modules/BuildTIFF.cmake index eefb62b1..88a9379e 100644 --- a/etc/SuperBuild/cmake/Modules/BuildTIFF.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildTIFF.cmake @@ -26,6 +26,6 @@ ExternalProject_Add( DEPENDS ZLIB GIT_REPOSITORY ${TIFF_GIT_REPOSITORY} GIT_TAG ${TIFF_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${TIFF_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/BuildUSD.cmake b/etc/SuperBuild/cmake/Modules/BuildUSD.cmake index 8d40b6ef..aa3a0320 100644 --- a/etc/SuperBuild/cmake/Modules/BuildUSD.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildUSD.cmake @@ -54,7 +54,7 @@ ExternalProject_Add( DEPENDS ${USD_DEPS} GIT_REPOSITORY ${USD_GIT_REPOSITORY} GIT_TAG ${USD_GIT_TAG} - + GIT_SHALLOW 1 CONFIGURE_COMMAND "" BUILD_COMMAND ${PYTHON_EXECUTABLE} build_scripts/build_usd.py ${CMAKE_INSTALL_PREFIX} ${USD_ARGS} BUILD_IN_SOURCE 1 diff --git a/etc/SuperBuild/cmake/Modules/BuildVPX.cmake b/etc/SuperBuild/cmake/Modules/BuildVPX.cmake index a5225353..bab55cc0 100755 --- a/etc/SuperBuild/cmake/Modules/BuildVPX.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildVPX.cmake @@ -10,6 +10,9 @@ if(WIN32 OR NOT TLRENDER_FFMPEG) # Compiled with MSys scripts else() + include(ProcessorCount) + ProcessorCount(NPROCS) + set(VPX_CFLAGS) set(VPX_CXXFLAGS) set(VPX_OBJCFLAGS) @@ -52,9 +55,9 @@ else() DEPENDS ${TLRENDER_YASM_DEP} NASM GIT_REPOSITORY "https://github.com/webmproject/libvpx.git" GIT_TAG ${VPX_TAG} - + GIT_SHALLOW 1 CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PATH=${YASM_BIN_PATH} -- ./configure ${VPX_CONFIGURE_ARGS} - BUILD_COMMAND ${CMAKE_COMMAND} -E env PATH=${YASM_BIN_PATH} -- make + BUILD_COMMAND ${CMAKE_COMMAND} -E env PATH=${YASM_BIN_PATH} -- make -j ${NPROCS} BUILD_IN_SOURCE 1 ) diff --git a/etc/SuperBuild/cmake/Modules/BuildX264.cmake b/etc/SuperBuild/cmake/Modules/BuildX264.cmake index a47f282a..379b73c7 100644 --- a/etc/SuperBuild/cmake/Modules/BuildX264.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildX264.cmake @@ -37,7 +37,7 @@ else() DEPENDS NASM GIT_REPOSITORY "https://code.videolan.org/videolan/x264.git" GIT_TAG ${X264_TAG} - + GIT_SHALLOW 1 CONFIGURE_COMMAND ./configure ${X264_CONFIGURE_ARGS} BUILD_IN_SOURCE 1 ) diff --git a/etc/SuperBuild/cmake/Modules/BuildZLIB.cmake b/etc/SuperBuild/cmake/Modules/BuildZLIB.cmake index 50dc40bd..8ac0d1d1 100644 --- a/etc/SuperBuild/cmake/Modules/BuildZLIB.cmake +++ b/etc/SuperBuild/cmake/Modules/BuildZLIB.cmake @@ -13,7 +13,7 @@ ExternalProject_Add( PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ZLIB GIT_REPOSITORY ${ZLIB_GIT_REPOSITORY} GIT_TAG ${ZLIB_GIT_TAG} - + GIT_SHALLOW 1 PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/ZLIB-patch/CMakeLists.txt ${CMAKE_CURRENT_BINARY_DIR}/ZLIB/src/ZLIB/CMakeLists.txt diff --git a/etc/SuperBuild/cmake/Modules/Builddav1d.cmake b/etc/SuperBuild/cmake/Modules/Builddav1d.cmake index 541f2a38..6b49336a 100644 --- a/etc/SuperBuild/cmake/Modules/Builddav1d.cmake +++ b/etc/SuperBuild/cmake/Modules/Builddav1d.cmake @@ -19,7 +19,7 @@ ExternalProject_Add( DEPENDS NASM GIT_REPOSITORY "https://code.videolan.org/videolan/dav1d.git" GIT_TAG ${dav1d_GIT_TAG} - + GIT_SHALLOW 1 CONFIGURE_COMMAND ${dav1d_CONFIGURE} BUILD_COMMAND ${dav1d_BUILD} INSTALL_COMMAND ${dav1d_INSTALL} diff --git a/etc/SuperBuild/cmake/Modules/Buildexpat.cmake b/etc/SuperBuild/cmake/Modules/Buildexpat.cmake index b2cc4c3e..e834d11a 100644 --- a/etc/SuperBuild/cmake/Modules/Buildexpat.cmake +++ b/etc/SuperBuild/cmake/Modules/Buildexpat.cmake @@ -14,7 +14,7 @@ ExternalProject_Add( PREFIX ${CMAKE_CURRENT_BINARY_DIR}/expat GIT_REPOSITORY ${expat_GIT_REPOSITORY} GIT_TAG ${expat_GIT_TAG} - + GIT_SHALLOW 1 SOURCE_SUBDIR expat LIST_SEPARATOR | CMAKE_ARGS ${expat_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/Buildjasper.cmake b/etc/SuperBuild/cmake/Modules/Buildjasper.cmake index 5deab72d..80c9fa70 100644 --- a/etc/SuperBuild/cmake/Modules/Buildjasper.cmake +++ b/etc/SuperBuild/cmake/Modules/Buildjasper.cmake @@ -24,7 +24,7 @@ ExternalProject_Add( PREFIX ${CMAKE_CURRENT_BINARY_DIR}/jasper GIT_REPOSITORY ${jasper_GIT_REPOSITORY} GIT_TAG ${jasper_GIT_TAG} - + GIT_SHALLOW 1 DEPENDS ${jasper_DEPS} LIST_SEPARATOR | CMAKE_ARGS ${jasper_ARGS} diff --git a/etc/SuperBuild/cmake/Modules/Buildlibjpeg-turbo.cmake b/etc/SuperBuild/cmake/Modules/Buildlibjpeg-turbo.cmake index cf05f2c0..195374dd 100644 --- a/etc/SuperBuild/cmake/Modules/Buildlibjpeg-turbo.cmake +++ b/etc/SuperBuild/cmake/Modules/Buildlibjpeg-turbo.cmake @@ -30,6 +30,6 @@ ExternalProject_Add( DEPENDS ${libjpeg-turbo_DEPS} GIT_REPOSITORY ${libjpeg-turbo_GIT_REPOSITORY} GIT_TAG ${libjpeg-turbo_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${libjpeg-turbo_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/Buildminizip-ng.cmake b/etc/SuperBuild/cmake/Modules/Buildminizip-ng.cmake index b5ffb6b2..d78483bf 100644 --- a/etc/SuperBuild/cmake/Modules/Buildminizip-ng.cmake +++ b/etc/SuperBuild/cmake/Modules/Buildminizip-ng.cmake @@ -23,6 +23,6 @@ ExternalProject_Add( DEPENDS ZLIB GIT_REPOSITORY ${minizip-ng_GIT_REPOSITORY} GIT_TAG ${minizip-ng_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${minizip-ng_ARGS}) diff --git a/etc/SuperBuild/cmake/Modules/Buildnlohmann_json.cmake b/etc/SuperBuild/cmake/Modules/Buildnlohmann_json.cmake index 83537d43..6d4d55d1 100644 --- a/etc/SuperBuild/cmake/Modules/Buildnlohmann_json.cmake +++ b/etc/SuperBuild/cmake/Modules/Buildnlohmann_json.cmake @@ -11,7 +11,7 @@ ExternalProject_Add( PREFIX ${CMAKE_CURRENT_BINARY_DIR}/nlohmann_json GIT_REPOSITORY ${nlohmann_json_GIT_REPOSITORY} GIT_TAG ${nlohmann_json_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${nlohmann_json_ARGS} ) diff --git a/etc/SuperBuild/cmake/Modules/Buildpystring.cmake b/etc/SuperBuild/cmake/Modules/Buildpystring.cmake index a119c541..6db10495 100644 --- a/etc/SuperBuild/cmake/Modules/Buildpystring.cmake +++ b/etc/SuperBuild/cmake/Modules/Buildpystring.cmake @@ -11,7 +11,7 @@ ExternalProject_Add( PREFIX ${CMAKE_CURRENT_BINARY_DIR}/pystring GIT_REPOSITORY ${pystring_GIT_REPOSITORY} GIT_TAG ${pystring_GIT_TAG} - + GIT_SHALLOW 1 PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/pystring-patch/CMakeLists.txt ${CMAKE_CURRENT_BINARY_DIR}/pystring/src/pystring/CMakeLists.txt diff --git a/etc/SuperBuild/cmake/Modules/Buildyaml-cpp.cmake b/etc/SuperBuild/cmake/Modules/Buildyaml-cpp.cmake index 5545a8b6..cf7b180f 100644 --- a/etc/SuperBuild/cmake/Modules/Buildyaml-cpp.cmake +++ b/etc/SuperBuild/cmake/Modules/Buildyaml-cpp.cmake @@ -14,6 +14,6 @@ ExternalProject_Add( PREFIX ${CMAKE_CURRENT_BINARY_DIR}/yaml-cpp GIT_REPOSITORY ${yaml-cpp_GIT_REPOSITORY} GIT_TAG ${yaml-cpp_GIT_TAG} - + GIT_SHALLOW 1 LIST_SEPARATOR | CMAKE_ARGS ${yaml-cpp_ARGS})