Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-08-11 00:26:38 +0200
committerGitHub2021-08-11 00:26:38 +0200
commit7d0770adf28737ec681bec40e4c3fdb650a4f6ad (patch)
tree6b14d7ec26b423c1801934af3d4283a0244d1a18
parent52a3144145ac9ba73bb7e8c123b5d0c88e57a8cc (diff)
parent74db06199bde41e0de0b6f5b7653aeb8d670159f (diff)
downloadcatch3-7d0770adf28737ec681bec40e4c3fdb650a4f6ad.tar.gz
Merge pull request #2269 from numaru/feature/rename-contrib-in-docs
Rename contrib/ to extras/ in the docs
-rw-r--r--docs/ci-and-misc.md2
-rw-r--r--docs/cmake-integration.md6
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/ci-and-misc.md b/docs/ci-and-misc.md
index 40b7cec9..0d016618 100644
--- a/docs/ci-and-misc.md
+++ b/docs/ci-and-misc.md
@@ -95,7 +95,7 @@ can use `pkg-config` to get its include path: `pkg-config --cflags catch2`.
### gdb and lldb scripts
-Catch2's `contrib` folder also contains two simple debugger scripts,
+Catch2's `extras` folder also contains two simple debugger scripts,
`gdbinit` for `gdb` and `lldbinit` for `lldb`. If loaded into their
respective debugger, these will tell it to step over Catch2's internals
when stepping through code.
diff --git a/docs/cmake-integration.md b/docs/cmake-integration.md
index 1d261189..e872dcee 100644
--- a/docs/cmake-integration.md
+++ b/docs/cmake-integration.md
@@ -96,13 +96,13 @@ catch_discover_tests(foo)
```
When using `FetchContent`, `include(Catch)` will fail unless
-`CMAKE_MODULE_PATH` is explicitly updated to include the contrib
+`CMAKE_MODULE_PATH` is explicitly updated to include the extras
directory.
```cmake
# ... FetchContent ...
#
-list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/contrib)
+list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
include(CTest)
include(Catch)
catch_discover_tests()
@@ -265,7 +265,7 @@ that consume it. These are:
Catch2's test binary will be built. Defaults to `ON`.
* `CATCH_INSTALL_DOCS` -- When `ON`, Catch2's documentation will be
included in the installation. Defaults to `ON`.
-* `CATCH_INSTALL_HELPERS` -- When `ON`, Catch2's contrib folder will be
+* `CATCH_INSTALL_HELPERS` -- When `ON`, Catch2's extras folder will be
included in the installation. Defaults to `ON`.
* `CATCH_DEVELOPMENT_BUILD` -- When `ON`, configures the build for development
of Catch2. This means enabling test projects, warnings and so on.