Skip to content

Commit

Permalink
Always use a static gtest (#1532)
Browse files Browse the repository at this point in the history
Removes the need for us to install GTest in our rmm CI containers.

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Mark Harris (https://github.com/harrism)
  - Jake Awe (https://github.com/AyodeAwe)

URL: #1532
  • Loading branch information
robertmaynard authored Apr 17, 2024
1 parent 588928f commit 9e6db74
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 30 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ endif()
# * add tests --------------------------------------------------------------------------------------

if(BUILD_TESTS AND CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
include(cmake/thirdparty/get_gtest.cmake)
include(${rapids-cmake-dir}/cpm/gtest.cmake)
rapids_cpm_gtest(BUILD_STATIC)
include(CTest) # calls enable_testing()

add_subdirectory(tests)
Expand Down
22 changes: 0 additions & 22 deletions cmake/thirdparty/get_gtest.cmake

This file was deleted.

3 changes: 0 additions & 3 deletions conda/recipes/librmm/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ cmake_version:
fmt_version:
- ">=10.1.1,<11"

gtest_version:
- ">=1.13.0"

spdlog_version:
- ">=1.12.0,<1.13"

Expand Down
4 changes: 0 additions & 4 deletions conda/recipes/librmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ requirements:
# added as a run requirement via the packages' run_exports.
- fmt {{ fmt_version }}
- spdlog {{ spdlog_version }}
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}

build:
script_env:
Expand Down Expand Up @@ -150,8 +148,6 @@ outputs:
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- {{ pin_subpackage('librmm', exact=True) }}
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
about:
home: https://rapids.ai/
license: Apache-2.0
Expand Down

0 comments on commit 9e6db74

Please sign in to comment.