diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 5ed1b9f4..f64b2c5d 100644 --- 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 index 808ed080..2944c0e7 100644 --- 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 index 6d1aa54e..59f7bc5a 100644 --- 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 index 97bfc604..c99737bd 100644 --- 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 deleted file mode 100644 index 3a94dd74..00000000 --- a/cpp/cmake/thirdparty/get_gtest.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# ============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. -# ============================================================================= - -# This function finds gtest and sets any additional necessary environment variables. -function(find_and_configure_gtest) - include(${rapids-cmake-dir}/cpm/gtest.cmake) - - # Find or install GoogleTest - rapids_cpm_gtest(BUILD_EXPORT_SET ucxx-testing-exports INSTALL_EXPORT_SET ucxx-testing-exports) - - if(GTest_ADDED) - rapids_export( - BUILD GTest - VERSION ${GTest_VERSION} - EXPORT_SET GTestTargets - GLOBAL_TARGETS gtest gmock gtest_main gmock_main - NAMESPACE GTest:: - ) - - include("${rapids-cmake-dir}/export/find_package_root.cmake") - rapids_export_find_package_root( - BUILD GTest [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET ucxx-testing-exports - ) - endif() - -endfunction() - -find_and_configure_gtest() diff --git a/dependencies.yaml b/dependencies.yaml index 639288eb..5ab6422f 100644 --- 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 - - >est 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]