haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtest: Update to 1.14.0 (#11167)

Browse Source
This commit is contained in:
Mika Lindqvist
2024-10-02 10:59:58 +03:00
committed by GitHub
parent ba6f3e487f
commit 13051a4d09
3 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dev-libs/gtest/gtest-1.11.0.recipe → dev-libs/gtest/gtest-1.14.0.recipe
View File

@@ -14,11 +14,11 @@ Features:
HOMEPAGE="https://github.com/google/googletest"
COPYRIGHT="2008-2019 Google Test developers"
LICENSE="BSD (3-clause)"
REVISION="3"
SOURCE_URI="https://github.com/google/googletest/archive/release-$portVersion.tar.gz"
CHECKSUM_SHA256="b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5"
SOURCE_FILENAME="googletest-release-$portVersion.tar.gz"
SOURCE_DIR="googletest-release-$portVersion"
REVISION="1"
SOURCE_URI="https://github.com/google/googletest/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7"
SOURCE_FILENAME="v$portVersion.tar.gz"
SOURCE_DIR="googletest-$portVersion"
PATCHES="gtest-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -59,10 +59,10 @@ BUILD_PREREQUIRES="
"
defineDebugInfoPackage gtest$secondaryArchSuffix \
$libDir/libgmock.so.1.11.0 \
$libDir/libgmock_main.so.1.11.0 \
$libDir/libgtest.so.1.11.0 \
$libDir/libgtest_main.so.1.11.0
$libDir/libgmock.so.$portVersion \
$libDir/libgmock_main.so.$portVersion \
$libDir/libgtest.so.$portVersion \
$libDir/libgtest_main.so.$portVersion
BUILD()
{
@@ -105,7 +105,7 @@ TEST()
#
# See https://git.haiku-os.org/haiku/commit/?id=1b744548e0a31d725a147cfeadf3eeb30a4eb84c
#
# Other than that, runnint hp --test gtest_x86 results in:
# Other than that, running hp --test gtest_x86 results in:
#
# 100% tests passed, 0 tests failed out of 45
make -C build test

43
dev-libs/gtest/patches/gtest-1.11.0.patchset
View File

@@ -1,43 +0,0 @@
From f158183b7b7af0e1630d4e9f1e161f65e27a5d48 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 20 Oct 2021 16:43:05 +0200
Subject: fix CMake config files
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
index e7df8ec..869bfcb 100644
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
@@ -111,10 +111,10 @@ endif()
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
target_include_directories(gmock SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_include_directories(gmock_main SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gmock_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
endif()
########################################################################
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
index abdd98b..7ae174d 100644
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -138,10 +138,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
target_include_directories(gtest SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_include_directories(gtest_main SYSTEM INTERFACE
"$<BUILD_INTERFACE:${gtest_build_include_dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
endif()
target_link_libraries(gtest_main PUBLIC gtest)
--
2.30.2

43
dev-libs/gtest/patches/gtest-1.14.0.patchset Normal file
View File

@@ -0,0 +1,43 @@
From 0c4371e13b0cd8c85b0009c6024d1843d28da385 Mon Sep 17 00:00:00 2001
From: "Jerome Duval" <jerome.duval@gmail.com>
Date: Fri, 27 Sep 2024 18:17:12 +0000
Subject: fix CMake config files
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
index a9aa072..2dc9298 100644
--- a/googlemock/CMakeLists.txt
+++ b/googlemock/CMakeLists.txt
@@ -104,10 +104,10 @@ endif()
string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
target_include_directories(gmock SYSTEM INTERFACE
"$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_include_directories(gmock_main SYSTEM INTERFACE
"$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
########################################################################
#
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
index caafa8c..60be746 100644
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}")
target_include_directories(gtest SYSTEM INTERFACE
"$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
target_include_directories(gtest_main SYSTEM INTERFACE
"$<BUILD_INTERFACE:${dirs}>"
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
if(CMAKE_SYSTEM_NAME MATCHES "QNX")
target_link_libraries(gtest PUBLIC regex)
endif()
--
2.45.2