Remove gtest dependency from ucxx test conda package (#223)

Part of the effort to move all of RAPIDS over to a set of static testing / benchmarking libraries ( rapidsai/build-planning#32 ). Authors: - Robert Maynard (https://github.com/robertmaynard) Approvers: - Peter Andreas Entschev (https://github.com/pentschev) - Vyas Ramasubramani (https://github.com/vyasr) - Jake Awe (https://github.com/AyodeAwe) URL: #223
rapidsai · Apr 23, 2024 · bdd3ff9 · bdd3ff9
1 parent fd2e188
commit bdd3ff9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 52 deletions.
diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -22,8 +22,6 @@ dependencies:
 - dask-cudf==24.6.*
 - doxygen=1.9.1
 - fmt>=10.1.1,<11
-- gmock>=1.13.0
-- gtest>=1.13.0
 - librmm==24.6.*
 - libtool
 - ninja

diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml
@@ -22,8 +22,6 @@ dependencies:
 - dask-cudf==24.6.*
 - doxygen=1.9.1
 - fmt>=10.1.1,<11
-- gmock>=1.13.0
-- gtest>=1.13.0
 - librmm==24.6.*
 - libtool
 - ninja

diff --git a/conda/recipes/ucxx/meta.yaml b/conda/recipes/ucxx/meta.yaml
@@ -52,7 +52,6 @@ requirements:
     - ucx
     - python
     - librmm =24.06
-    - gtest
 
 outputs:
   - name: libucxx
@@ -184,8 +183,7 @@ outputs:
         - cuda-cudart
         {% endif %}
         - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
-        - gtest
-        - gmock
+
     about:
       home: https://rapids.ai/
       license: BSD-3-Clause

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -1,5 +1,5 @@
 # =================================================================================
-# SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
+# SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
 # SPDX-License-Identifier: BSD 3-Clause License
 # =================================================================================
 
@@ -115,7 +115,10 @@ if(UCXX_ENABLE_RMM)
 endif()
 # find or install GoogleTest
 if(BUILD_TESTS)
-  include(cmake/thirdparty/get_gtest.cmake)
+  include(${rapids-cmake-dir}/cpm/gtest.cmake)
+
+  # Find or install GoogleTest
+  rapids_cpm_gtest(BUILD_STATIC)
 endif()
 
 # ##################################################################################################

diff --git a/cpp/cmake/thirdparty/get_gtest.cmake b/cpp/cmake/thirdparty/get_gtest.cmake
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -120,8 +120,6 @@ dependencies:
           - cxx-compiler
           - &cmake_ver cmake>=3.26.4
           - fmt>=10.1.1,<11
-          - &gmock gmock>=1.13.0
-          - &gtest gtest>=1.13.0
           - librmm==24.6.*
           - ninja
           - spdlog>=1.12.0,<1.13
@@ -250,8 +248,6 @@ dependencies:
       - output_types: conda
         packages:
           - *cmake_ver
-          - *gtest
-          - *gmock
   test_python_ucxx:
     common:
       - output_types: [conda, requirements, pyproject]