Skip to content

Commit

Permalink
Added back GIT_SHALLOW when possible.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Mar 29, 2024
1 parent a70c04c commit b3262c6
Show file tree
Hide file tree
Showing 24 changed files with 28 additions and 25 deletions.
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildCURL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildFreetype.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildImath.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildLCMS2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildLibssh2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildOTIO.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildOpenColorIO.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildOpenEXR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildPNG.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildSampleRate.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildSvtAV1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildTIFF.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildUSD.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions etc/SuperBuild/cmake/Modules/BuildVPX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildX264.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/BuildZLIB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/Builddav1d.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/Buildexpat.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/Buildjasper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/Buildlibjpeg-turbo.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/Buildminizip-ng.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/Buildnlohmann_json.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/Buildpystring.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion etc/SuperBuild/cmake/Modules/Buildyaml-cpp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})

0 comments on commit b3262c6

Please sign in to comment.