diff options
| author | Martin Hořeňovský | 2022-01-06 10:53:26 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-01-06 23:37:44 +0100 |
| commit | 39d3de17f3ec37a975be9bb21dbaf0117b137c5f (patch) | |
| tree | 77e47e4c6d99d1df901e4755d42d93b5c018559a | |
| parent | fff494c10ad223d8fe7732d227be9e3cede6097e (diff) | |
| download | catch3-39d3de17f3ec37a975be9bb21dbaf0117b137c5f.tar.gz | |
Fix mentions of CATCH_INSTALL_HELPERS
Fixes #2347
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | conanfile.py | 2 | ||||
| -rw-r--r-- | docs/cmake-integration.md | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ff8e020..fa8e4519 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ else() endif() option(CATCH_INSTALL_DOCS "Install documentation alongside library" ON) -option(CATCH_INSTALL_EXTRAS "Install extras alongside library" ON) +option(CATCH_INSTALL_EXTRAS "Install extras (CMake scripts, debugger helpers) alongside library" ON) option(CATCH_DEVELOPMENT_BUILD "Build tests, enable warnings, enable Werror, etc" OFF) include(CMakeDependentOption) diff --git a/conanfile.py b/conanfile.py index 7c597d49..1c25827b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -20,7 +20,7 @@ class CatchConan(ConanFile): cmake = CMake(self) cmake.definitions["BUILD_TESTING"] = "OFF" cmake.definitions["CATCH_INSTALL_DOCS"] = "OFF" - cmake.definitions["CATCH_INSTALL_HELPERS"] = "ON" + cmake.definitions["CATCH_INSTALL_EXTRAS"] = "ON" cmake.configure(build_folder="build") return cmake diff --git a/docs/cmake-integration.md b/docs/cmake-integration.md index d8d08495..88425353 100644 --- a/docs/cmake-integration.md +++ b/docs/cmake-integration.md @@ -265,8 +265,9 @@ 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 extras folder will be -included in the installation. Defaults to `ON`. +* `CATCH_INSTALL_EXTRAS` -- When `ON`, Catch2's extras folder (the CMake +scripts mentioned above, debugger helpers) 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. Defaults to `OFF`. |