From cce3118d8320e924a84788f569b00a3b780faa23 Mon Sep 17 00:00:00 2001 From: Paul-Edouard Sarlin Date: Wed, 10 Jan 2024 14:58:30 +0100 Subject: [PATCH] Remove vcpkg forks --- package/install-colmap-centos.sh | 2 +- package/install-colmap-macos.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/package/install-colmap-centos.sh b/package/install-colmap-centos.sh index deb4f110..41820870 100755 --- a/package/install-colmap-centos.sh +++ b/package/install-colmap-centos.sh @@ -18,7 +18,7 @@ export PATH="${COMPILER_TOOLS_DIR}:${PATH}" ccache --version ccache --help -git clone --branch sarlinpe/libraw-jaspter-nodefaults https://github.com/sarlinpe/vcpkg ${VCPKG_INSTALLATION_ROOT} +git clone https://github.com/microsoft/vcpkg ${VCPKG_INSTALLATION_ROOT} cd ${VCPKG_INSTALLATION_ROOT} ./bootstrap-vcpkg.sh ./vcpkg install --recurse --clean-after-build --triplet=${VCPKG_TARGET_TRIPLET} \ diff --git a/package/install-colmap-macos.sh b/package/install-colmap-macos.sh index 95c32c2b..afd04da4 100755 --- a/package/install-colmap-macos.sh +++ b/package/install-colmap-macos.sh @@ -15,10 +15,7 @@ brew remove node@18 brew update brew install git cmake ninja llvm ccache -cd ${CURRDIR} -#git clone https://github.com/microsoft/vcpkg ${VCPKG_INSTALLATION_ROOT} -git clone --branch sarlinpe/lapack-osx https://github.com/sarlinpe/vcpkg ${VCPKG_INSTALLATION_ROOT} - +git clone https://github.com/microsoft/vcpkg ${VCPKG_INSTALLATION_ROOT} cd ${VCPKG_INSTALLATION_ROOT} ./bootstrap-vcpkg.sh ./vcpkg install --recurse --clean-after-build --triplet=${VCPKG_TARGET_TRIPLET} \