From 15a3e6a59c7049b0b3f3b6b348f09b0f3ea71723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Crist=C3=B3bal=20Arroyo?= Date: Fri, 2 Jun 2023 14:26:37 +0000 Subject: [PATCH 1/3] Bump vcpkg snapshot to support pybind 2.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cristóbal Arroyo --- jenkins-scripts/lib/windows_env_vars.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/lib/windows_env_vars.bat b/jenkins-scripts/lib/windows_env_vars.bat index c3d54a152..1d888187d 100644 --- a/jenkins-scripts/lib/windows_env_vars.bat +++ b/jenkins-scripts/lib/windows_env_vars.bat @@ -16,7 +16,7 @@ set VCPKG_CMD=%VCPKG_DIR%\vcpkg.exe set VCPKG_CMAKE_TOOLCHAIN_FILE=%VCPKG_DIR%/scripts/buildsystems/vcpkg.cmake if NOT DEFINED VCPKG_SNAPSHOT ( :: see https://github.com/microsoft/vcpkg/releases - set VCPKG_SNAPSHOT=2022.02.23 + set VCPKG_SNAPSHOT=2023.04.15 ) :: Set of common gz dependencies expected up to Garden set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt sqlite3 tinyxml2 zeromq From aef87b394395397bb2fc81ef0078bada1a16ab1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Crist=C3=B3bal=20Arroyo?= Date: Fri, 2 Jun 2023 14:46:13 +0000 Subject: [PATCH 2/3] Use commit hash instead of tag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cristóbal Arroyo --- jenkins-scripts/lib/windows_env_vars.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/lib/windows_env_vars.bat b/jenkins-scripts/lib/windows_env_vars.bat index 1d888187d..5794cb9ef 100644 --- a/jenkins-scripts/lib/windows_env_vars.bat +++ b/jenkins-scripts/lib/windows_env_vars.bat @@ -16,7 +16,7 @@ set VCPKG_CMD=%VCPKG_DIR%\vcpkg.exe set VCPKG_CMAKE_TOOLCHAIN_FILE=%VCPKG_DIR%/scripts/buildsystems/vcpkg.cmake if NOT DEFINED VCPKG_SNAPSHOT ( :: see https://github.com/microsoft/vcpkg/releases - set VCPKG_SNAPSHOT=2023.04.15 + set VCPKG_SNAPSHOT=501db0f ) :: Set of common gz dependencies expected up to Garden set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt sqlite3 tinyxml2 zeromq From 369c3cb591f528d6989c25b0f933d527aab73247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Crist=C3=B3bal=20Arroyo?= Date: Fri, 2 Jun 2023 14:47:59 +0000 Subject: [PATCH 3/3] Go back to previous vcpkg snapshot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cristóbal Arroyo --- jenkins-scripts/lib/windows_env_vars.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-scripts/lib/windows_env_vars.bat b/jenkins-scripts/lib/windows_env_vars.bat index 5794cb9ef..c3d54a152 100644 --- a/jenkins-scripts/lib/windows_env_vars.bat +++ b/jenkins-scripts/lib/windows_env_vars.bat @@ -16,7 +16,7 @@ set VCPKG_CMD=%VCPKG_DIR%\vcpkg.exe set VCPKG_CMAKE_TOOLCHAIN_FILE=%VCPKG_DIR%/scripts/buildsystems/vcpkg.cmake if NOT DEFINED VCPKG_SNAPSHOT ( :: see https://github.com/microsoft/vcpkg/releases - set VCPKG_SNAPSHOT=501db0f + set VCPKG_SNAPSHOT=2022.02.23 ) :: Set of common gz dependencies expected up to Garden set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt sqlite3 tinyxml2 zeromq