Merge pull request #10214 from OatmealDome/mvk-better-incremental

MoltenVK: Don't run fetchDependencies unnecessarily
This commit is contained in:
Scott Mansell 2021-11-25 11:47:36 +13:00 committed by GitHub
commit 676c500cdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions

View File

@ -1,10 +1,12 @@
include(ExternalProject)
set(MOLTENVK_VERSION "v1.1.5")
ExternalProject_Add(MoltenVK
GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git
GIT_TAG v1.1.5
GIT_TAG ${MOLTENVK_VERSION}
CONFIGURE_COMMAND <SOURCE_DIR>/fetchDependencies --macos
CONFIGURE_COMMAND ${CMAKE_CURRENT_LIST_DIR}/configure.sh <LOG_DIR> <SOURCE_DIR> ${MOLTENVK_VERSION}
BUILD_COMMAND make -C <SOURCE_DIR> macos
BUILD_IN_SOURCE ON

20
Externals/MoltenVK/configure.sh vendored Executable file
View File

@ -0,0 +1,20 @@
#!/bin/bash
# To lower build times, we avoid running the fetchDependencies script if the MoltenVK
# version didn't change. The last-built MoltenVK version is stored inside a file in
# the timestamp directory. If the file doesn't exist or the file contains a different
# MoltenVK version, fetchDependencies is ran.
#
# Usage: configure.sh <timestamp directory> <source directory> <MoltenVK version>
#
set -e
VERSION_PATH="$1/MoltenVK-last-version.txt"
CURRENT_VERSION="$3"
LAST_VERSION=$(cat "$VERSION_PATH" || true)
if ! [ "$LAST_VERSION" = "$3" ]; then
$2/fetchDependencies --macos
echo $CURRENT_VERSION > $VERSION_PATH
fi