mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
gtest, bump to 1.17.0 (#12834)
This commit is contained in:
@@ -16,7 +16,7 @@ COPYRIGHT="2008-2019 Google Test developers"
|
||||
LICENSE="BSD (3-clause)"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/google/googletest/archive/refs/tags/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7"
|
||||
CHECKSUM_SHA256="65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c"
|
||||
SOURCE_FILENAME="v$portVersion.tar.gz"
|
||||
SOURCE_DIR="googletest-$portVersion"
|
||||
PATCHES="gtest-$portVersion.patchset"
|
||||
@@ -69,7 +69,7 @@ BUILD()
|
||||
mkdir -p build && cd build
|
||||
|
||||
cmake .. $cmakeDirArgs \
|
||||
-DCMAKE_BUILD_TYPE='Release' \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DBUILD_SHARED_LIBS:BOOL=ON \
|
||||
-Dgtest_build_tests=ON
|
||||
make $jobArgs
|
||||
@@ -5,10 +5,10 @@ Subject: fix CMake config files
|
||||
|
||||
|
||||
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
|
||||
index a9aa072..2dc9298 100644
|
||||
index 99b2411..33ec963 100644
|
||||
--- a/googlemock/CMakeLists.txt
|
||||
+++ b/googlemock/CMakeLists.txt
|
||||
@@ -104,10 +104,10 @@ endif()
|
||||
@@ -105,10 +105,10 @@ endif()
|
||||
string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
|
||||
target_include_directories(gmock SYSTEM INTERFACE
|
||||
"$<BUILD_INTERFACE:${dirs}>"
|
||||
@@ -22,7 +22,7 @@ index a9aa072..2dc9298 100644
|
||||
########################################################################
|
||||
#
|
||||
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
|
||||
index caafa8c..60be746 100644
|
||||
index dce6a7c..f1da42f 100644
|
||||
--- a/googletest/CMakeLists.txt
|
||||
+++ b/googletest/CMakeLists.txt
|
||||
@@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
|
||||
@@ -35,7 +35,7 @@ index caafa8c..60be746 100644
|
||||
"$<BUILD_INTERFACE:${dirs}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "QNX")
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "QNX" AND CMAKE_SYSTEM_VERSION VERSION_GREATER_EQUAL 7.1)
|
||||
target_link_libraries(gtest PUBLIC regex)
|
||||
endif()
|
||||
--
|
||||
Reference in New Issue
Block a user