diff --git a/ports/gtest/fix-main-lib-path.patch b/ports/gtest/fix-main-lib-path.patch index 2a7be9dce6..2cfd2c44f3 100644 --- a/ports/gtest/fix-main-lib-path.patch +++ b/ports/gtest/fix-main-lib-path.patch @@ -1,36 +1,40 @@ diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt -index e7df8ec..1ecd596 100644 +index 99b2411f..74610b12 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt -@@ -112,7 +112,8 @@ endif() +@@ -112,8 +112,9 @@ target_include_directories(gmock_main SYSTEM INTERFACE + ######################################################################## # - # Install rules +-# Install rules. -install_project(gmock gmock_main) ++# Install rules +install_project(gmock) +install_project(gmock_main) ######################################################################## # diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt -index abdd98b..7d1c01d 100644 +index dce6a7c9..d8faf644 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt -@@ -155,7 +155,8 @@ target_link_libraries(gtest_main PUBLIC gtest) +@@ -154,8 +154,9 @@ target_link_libraries(gtest_main PUBLIC gtest) + ######################################################################## # - # Install rules +-# Install rules. -install_project(gtest gtest_main) ++# Install rules +install_project(gtest) +install_project(gtest_main) ######################################################################## # diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake -index 8d8d60a..b08ce28 100644 +index 580ac1cb..78a5b659 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake -@@ -300,12 +300,16 @@ function(install_project) +@@ -302,12 +302,16 @@ function(install_project) COMPONENT "${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") # Install the project targets. @@ -47,9 +51,9 @@ index 8d8d60a..b08ce28 100644 + ARCHIVE DESTINATION "${LIB_INSTALL_DST}" + LIBRARY DESTINATION "${LIB_INSTALL_DST}") if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - # Install PDBs + # Install PDBs. foreach(t ${ARGN}) -@@ -315,7 +319,7 @@ function(install_project) +@@ -317,7 +321,7 @@ function(install_project) install(FILES "${t_pdb_output_directory}/\${CMAKE_INSTALL_CONFIG_NAME}/$<$:${t_pdb_name_debug}>$<$>:${t_pdb_name}>.pdb" COMPONENT "${PROJECT_NAME}" diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 6b20051e69..b558c69b7b 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/googletest REF "v${VERSION}" - SHA512 765c326ccc1b87a01027385e69238266e356361cd4ee3e18e3c9d137a5d11fa5d657c164d02dd1be8fe693c8e10f2b580588dbfa57d27f070e2750f50d3e662c + SHA512 1a623022f932925b7dc3e557c14cc81c5edc0631ca92cc94b5f80968c5ad38003880282129b71a99e4ee56d7204db71a156f5af12d79021cfad4417c2f80cc4b HEAD_REF main PATCHES 001-fix-UWP-death-test.patch diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 7ca918512b..9df3b9cd04 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gtest", - "version-semver": "1.14.0", - "port-version": 1, + "version-semver": "1.15.0", "description": "Google Testing and Mocking Framework", "homepage": "https://github.com/google/googletest", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 83a98138e1..e61d5db1ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3257,8 +3257,8 @@ "port-version": 8 }, "gtest": { - "baseline": "1.14.0", - "port-version": 1 + "baseline": "1.15.0", + "port-version": 0 }, "gtk": { "baseline": "4.14.0", diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 855c422e0e..9293b701ef 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a66c1c9751049e5a44ce47a0101f146ae233d152", + "version-semver": "1.15.0", + "port-version": 0 + }, { "git-tree": "75ebdb53e37267a1d5f6283223367cd0aa1104ef", "version-semver": "1.14.0",