use our own gtest

conda-forge · May 13, 2023 · 882c050 · 882c050
1 parent a1bf856
commit 882c050
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/recipe/build-lib.bat b/recipe/build-lib.bat
@@ -19,6 +19,7 @@ cmake -G "Ninja" ^
     -Dprotobuf_BUILD_SHARED_LIBS=%CF_SHARED% ^
     -Dprotobuf_JSONCPP_PROVIDER="package" ^
     -Dprotobuf_MSVC_STATIC_RUNTIME=OFF ^
+    -Dprotobuf_USE_EXTERNAL_GTEST=ON ^
     -Dprotobuf_WITH_ZLIB=ON ^
     ..
 if %ERRORLEVEL% neq 0 exit 1

diff --git a/recipe/build-lib.sh b/recipe/build-lib.sh
@@ -40,6 +40,7 @@ cmake -G "Ninja" \
     -Dprotobuf_ABSL_PROVIDER="package" \
     -Dprotobuf_BUILD_SHARED_LIBS=$CF_SHARED \
     -Dprotobuf_JSONCPP_PROVIDER="package" \
+    -Dprotobuf_USE_EXTERNAL_GTEST=ON \
     -Dprotobuf_WITH_ZLIB=ON \
     ..
 

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -18,11 +18,6 @@ source:
       - patches/0002-set-static-lib-extension-on-windows.patch
       # backport https://github.com/protocolbuffers/protobuf/pull/12577
       - patches/0003-Enable-the-selection-of-system-provided-jsoncpp-1257.patch
-  # git submodules (except abseil & jsoncpp) as of:
-  # https://github.com/protocolbuffers/protobuf/tree/v22.3/third_party
-  - url: https://github.com/google/googletest/archive/4c9a3bb62bf3ba1f1010bf96f9c8ed767b363774.tar.gz
-    sha256: ea54c9845568cb31c03f2eddc7a40f7f83912d04ab977ff50ec33278119548dd
-    folder: third_party/googletest
 
 build:
   number: 0
@@ -44,6 +39,7 @@ outputs:
         - cmake
         - ninja
       host:
+        - gtest
         - jsoncpp
         - libabseil
         # requires abseil test targets to build with tests enabled
@@ -99,6 +95,7 @@ outputs:
         - cmake
         - ninja
       host:
+        - gtest
         - jsoncpp
         - libabseil
         - libabseil-tests