Skip to content

Commit b2cd200

Browse files
ianmcookkszucs
authored andcommitted
ARROW-12756: [C++] MSVC build fails with latest gtest from vcpkg
This pins gtest to version 1.10.0 in the vcpkg manifest Closes apache#10306 from ianmcook/ARROW-12756 Authored-by: Ian Cook <ianmcook@gmail.com> Signed-off-by: Krisztián Szűcs <szucs.krisztian@gmail.com>
1 parent 73d833c commit b2cd200

4 files changed

Lines changed: 9 additions & 2 deletions

File tree

cpp/vcpkg.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,9 @@
3636
"utf8proc",
3737
"zlib",
3838
"zstd"
39-
]
39+
],
40+
"overrides": [
41+
{ "name": "gtest", "version": "1.10.0", "port-version": 4 }
42+
],
43+
"builtin-baseline": "a267ab118c09f56f3dae96c9a4b3410820ad2f0b"
4044
}

dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Too
2929
vcpkg install ^
3030
--triplet x64-windows ^
3131
--x-manifest-root cpp ^
32+
--feature-flags=versions ^
3233
--clean-after-build ^
3334
|| exit /B 1
3435

docs/source/developers/cpp/building.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ With `vcpkg <https://github.com/Microsoft/vcpkg>`_:
7777
cd arrow
7878
vcpkg install \
7979
--x-manifest-root cpp \
80+
--feature-flags=versions \
8081
--clean-after-build
8182
8283
On MSYS2:
@@ -294,7 +295,7 @@ the build system how to resolve each dependency. There are a few options:
294295
have this feature
295296
* ``CONDA``: Use ``$CONDA_PREFIX`` as alternative ``SYSTEM`` PATH
296297
* ``VCPKG``: Find dependencies installed by vcpkg, and if not found, run
297-
``vpckg install`` to install them
298+
``vcpkg install`` to install them
298299
* ``BREW``: Use Homebrew default paths as an alternative ``SYSTEM`` path
299300

300301
The default method is ``AUTO`` unless you are developing within an active conda

docs/source/developers/cpp/windows.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ of Arrow and run the command:
134134
vcpkg install ^
135135
--triplet x64-windows ^
136136
--x-manifest-root cpp ^
137+
--feature-flags=versions ^
137138
--clean-after-build
138139
139140
On Windows, vcpkg builds dynamic link libraries by default. Use the triplet

0 commit comments

Comments
 (0)