aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Milette <charles.milette@gmail.com>2021-02-08 17:08:25 -0500
committerGitHub <noreply@github.com>2021-02-08 14:08:25 -0800
commitc177da97bd6ee2f031b329f943c6dea4decc3e97 (patch)
tree00d8214e8e8aac63d1458fc3acac2a4af2e0b2a1
parent7a438171d6e51b7909815b1268f19fd0e46dbed1 (diff)
downloadvcpkg-c177da97bd6ee2f031b329f943c6dea4decc3e97.tar.gz
vcpkg-c177da97bd6ee2f031b329f943c6dea4decc3e97.zip
[gtest] fix builds when using --head (#16071)
* [gtest] fix builds when using --head * Update port version * Update hash
-rw-r--r--ports/gtest/CONTROL2
-rw-r--r--ports/gtest/portfile.cmake2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/g-/gtest.json5
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/gtest/CONTROL b/ports/gtest/CONTROL
index c483eda23..c0f5bb9d4 100644
--- a/ports/gtest/CONTROL
+++ b/ports/gtest/CONTROL
@@ -1,5 +1,5 @@
Source: gtest
Version: 1.10.0
-Port-Version: 3
+Port-Version: 4
Homepage: https://github.com/google/googletest
Description: GoogleTest and GoogleMock testing frameworks.
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
index 4cb45954e..11ac1140a 100644
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@@ -76,4 +76,4 @@ endif()
vcpkg_copy_pdbs()
-file(INSTALL ${SOURCE_PATH}/googletest/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/versions/baseline.json b/versions/baseline.json
index b811af708..17f1bcb12 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2310,7 +2310,7 @@
},
"gtest": {
"baseline": "1.10.0",
- "port-version": 3
+ "port-version": 4
},
"gtk": {
"baseline": "3.22.19-4",
diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json
index 7cc621d82..25ef94eee 100644
--- a/versions/g-/gtest.json
+++ b/versions/g-/gtest.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "9f4e8f94a3fe61d4abcc1929129b2e21ad6cc066",
+ "version-string": "1.10.0",
+ "port-version": 4
+ },
+ {
"git-tree": "e94f8c09a8fa6ed7fc618734d412878d83069bfb",
"version-string": "1.10.0",
"port-version": 3