3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-11-03 21:49:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mentions of CATCH_INSTALL_HELPERS

Browse Source 
Fixes #2347
This commit is contained in:
Martin Hořeňovský
2022-01-06 10:53:26 +01:00
parent fff494c10a
commit 39d3de17f3
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -9,7 +9,7 @@ else()
endif() endif()
option(CATCH_INSTALL_DOCS "Install documentation alongside library" ON) 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) option(CATCH_DEVELOPMENT_BUILD "Build tests, enable warnings, enable Werror, etc" OFF)
include(CMakeDependentOption) include(CMakeDependentOption)

2
conanfile.py
View File

@@ -20,7 +20,7 @@ class CatchConan(ConanFile):
cmake = CMake(self) cmake = CMake(self)
cmake.definitions["BUILD_TESTING"] = "OFF" cmake.definitions["BUILD_TESTING"] = "OFF"
cmake.definitions["CATCH_INSTALL_DOCS"] = "OFF" cmake.definitions["CATCH_INSTALL_DOCS"] = "OFF"
cmake.definitions["CATCH_INSTALL_HELPERS"] = "ON" cmake.definitions["CATCH_INSTALL_EXTRAS"] = "ON"
cmake.configure(build_folder="build") cmake.configure(build_folder="build")
return cmake return cmake

5
docs/cmake-integration.md
View File

@@ -265,8 +265,9 @@ that consume it. These are:
Catch2's test binary will be built. Defaults to `ON`. Catch2's test binary will be built. Defaults to `ON`.
* `CATCH_INSTALL_DOCS` -- When `ON`, Catch2's documentation will be * `CATCH_INSTALL_DOCS` -- When `ON`, Catch2's documentation will be
included in the installation. Defaults to `ON`. included in the installation. Defaults to `ON`.
* `CATCH_INSTALL_HELPERS` -- When `ON`, Catch2's extras folder will be * `CATCH_INSTALL_EXTRAS` -- When `ON`, Catch2's extras folder (the CMake
included in the installation. Defaults to `ON`. scripts mentioned above, debugger helpers) will be included in the
installation. Defaults to `ON`.
* `CATCH_DEVELOPMENT_BUILD` -- When `ON`, configures the build for development * `CATCH_DEVELOPMENT_BUILD` -- When `ON`, configures the build for development
of Catch2. This means enabling test projects, warnings and so on. of Catch2. This means enabling test projects, warnings and so on.
Defaults to `OFF`. Defaults to `OFF`.