Cleanup

Author: twistedfall

ci/install-macos-vcpkg.sh

@@ -7,13 +7,6 @@ if [[ "${VCPKG_VERSION:-}" == "" ]]; then
 	exit 1
 fi
 
-# 2024-04-15, cmake 3.29.1 doesn't work so well with vcpkg, remove this line when cmake is 3.29.2+
-# https://github.com/microsoft/vcpkg/issues/37968
-brew list --versions
-brew -v update
-brew upgrade --force --display-times cmake
-brew list --versions
-
 export VCPKG_ROOT="$HOME/build/vcpkg"
 if [[ -e "$VCPKG_ROOT" && ! -e "$VCPKG_ROOT/.git" ]]; then
 	rm -rf "$VCPKG_ROOT"

ci/install-ubuntu-vcpkg.sh

@@ -36,17 +36,13 @@ export VCPKG_DEFAULT_TRIPLET=x64-linux
 	set +e
 	which cmake
 	cmake --version
-	# 2024-04-15, cmake 3.29.1 doesn't work so well with vcpkg, remove this hack when cmake is 3.29.2+
-	# https://github.com/microsoft/vcpkg/issues/37968
-	mv -vf /usr/local/bin/cmake /usr/local/bin/cmake.bad
 	if ! ./vcpkg install --clean-after-build --recurse "opencv[contrib,nonfree,ade]"; then
 		for log in "$VCPKG_ROOT/buildtrees"/**/*out.log; do
 			echo "=== $log"
 			cat "$log"
 		done
 		exit 1
 	fi
-	mv -vf /usr/local/bin/cmake.bad /usr/local/bin/cmake
 )
 # remove build artifacts to save CI cache space
 rm -rf "$VCPKG_ROOT/downloads" "$VCPKG_ROOT/buildtrees" "$VCPKG_ROOT/packages"

ci/install-windows-vcpkg.sh

@@ -8,10 +8,6 @@ rm -rf "$VCPKG_INSTALLATION_ROOT"
 # install llvm from choco in place of vcpkg to speed things up
 choco install -y llvm --version "$CHOCO_LLVM_VERSION"
 
-# 2024-04-15, cmake 3.29.1 doesn't work so well with vcpkg, remove this line when cmake is 3.29.2+
-# https://github.com/microsoft/vcpkg/issues/37968
-choco upgrade -y cmake --version 3.29.0
-
 export VCPKG_ROOT="$HOME/build/vcpkg"
 if [[ -e "$VCPKG_ROOT" && ! -e "$VCPKG_ROOT/.git" ]]; then
 	rm -rf "$VCPKG_ROOT"