diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 11:49:29 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 11:49:29 -0400 |
| commit | c1afa8b8238c25591ca80d068477aa7d4ce05fc8 (patch) | |
| tree | 284a9f8b319de5783ff83ad004a9e390cb60fd0d /ci/windows_msvc_cmake.bat | |
| parent | 23778b53f420f54eebc195dd8430e79bda165e5b (diff) | |
| parent | 4447c7562e3bc702ade25105912dce503f0c4010 (diff) | |
| download | abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.tar.gz abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.tar.bz2 abseil-c1afa8b8238c25591ca80d068477aa7d4ce05fc8.zip | |
Merge new upstream LTS 20240722.0
Diffstat (limited to 'ci/windows_msvc_cmake.bat')
| -rwxr-xr-x | ci/windows_msvc_cmake.bat | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/ci/windows_msvc_cmake.bat b/ci/windows_msvc_cmake.bat index c0f1ac94..c9aee785 100755 --- a/ci/windows_msvc_cmake.bat +++ b/ci/windows_msvc_cmake.bat @@ -14,19 +14,10 @@ SETLOCAL ENABLEDELAYEDEXPANSION -:: The commit of GoogleTest to be used in the CMake tests in this directory. -:: Keep this in sync with the commit in the WORKSPACE file. -:: TODO(dmauro): After the next GoogleTest release, use the stable file required -:: by Bzlmod. This means downloading a copy of the file and reuploading it to -:: avoid changing checksums if the compression is changed by GitHub. It also -:: means stop referring to it as a commit and instead use the uploaded filename. -SET ABSL_GOOGLETEST_COMMIT=f8d7d77c06936315286eb55f8de22cd23c188571 - -IF EXIST %KOKORO_GFILE_DIR%\distdir\%ABSL_GOOGLETEST_COMMIT%.zip ( - SET ABSL_GOOGLETEST_DOWNLOAD_URL=file://%KOKORO_GFILE_DIR%\distdir\%ABSL_GOOGLETEST_COMMIT%.zip -) ELSE ( - SET ABSL_GOOGLETEST_DOWNLOAD_URL=https://github.com/google/googletest/archive/%ABSL_GOOGLETEST_COMMIT%.zip -) +:: The version of GoogleTest to be used in the CMake tests in this directory. +:: Keep this in sync with the version in the WORKSPACE file. +SET ABSL_GOOGLETEST_VERSION=1.15.2 +SET ABSL_GOOGLETEST_DOWNLOAD_URL=https://github.com/google/googletest/releases/download/v%ABSL_GOOGLETEST_VERSION%/googletest-%ABSL_GOOGLETEST_VERSION%.tar.gz :: Replace '\' with '/' in Windows paths for CMake. :: Note that this cannot go inside the IF block above, because BAT files are weird. @@ -56,7 +47,6 @@ CD "build" SET CXXFLAGS="/WX" %CMAKE_BIN% ^ - -DABSL_BUILD_TEST_HELPERS=ON ^ -DABSL_BUILD_TESTING=ON ^ -DABSL_GOOGLETEST_DOWNLOAD_URL=%ABSL_GOOGLETEST_DOWNLOAD_URL% ^ -DBUILD_SHARED_LIBS=%ABSL_CMAKE_BUILD_SHARED% ^ |