From d7687b4a10c88f7a85f6a28f399b75dd20325e1c Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 30 Mar 2021 12:59:53 +0200 Subject: [PATCH 1/2] Add docs for CMAKE_SH and data in cmakedeps --- reference/conanfile/tools/cmake.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/reference/conanfile/tools/cmake.rst b/reference/conanfile/tools/cmake.rst index 958db8b39ce..8af112c9c9c 100644 --- a/reference/conanfile/tools/cmake.rst +++ b/reference/conanfile/tools/cmake.rst @@ -13,8 +13,8 @@ CMakeDeps Available since: `1.33.0 `_ -The ``CMakeDeps`` helper will generate one **xxxx-config.cmake** file per dependency, together with other necessary .cmake files -like version, or configuration. It can be used like: +The ``CMakeDeps`` helper will generate one **xxxx-config.cmake** file per dependency, together with other necessary *.cmake* files +like version, flags and directory data or configuration. It can be used like: .. code-block:: python @@ -231,6 +231,11 @@ when a package is being built directly by Conan (create, install) cmake.configure() cmake.build() +.. note: + +**Note:** This helper includes the additional flag `-DCMAKE_SH="CMAKE_SH-NOTFOUND"` when using the `MinGW Makefiles` CMake's +generator, to avoid the error of `sh` being in the PATH (CMake version < 3.17.0). + It supports the following methods: constructor From cfe8cd8368418783a8edbbf97664b6d6116c383e Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 30 Mar 2021 13:01:46 +0200 Subject: [PATCH 2/2] remove note box --- reference/conanfile/tools/cmake.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/reference/conanfile/tools/cmake.rst b/reference/conanfile/tools/cmake.rst index 8af112c9c9c..6e073a28a13 100644 --- a/reference/conanfile/tools/cmake.rst +++ b/reference/conanfile/tools/cmake.rst @@ -231,8 +231,6 @@ when a package is being built directly by Conan (create, install) cmake.configure() cmake.build() -.. note: - **Note:** This helper includes the additional flag `-DCMAKE_SH="CMAKE_SH-NOTFOUND"` when using the `MinGW Makefiles` CMake's generator, to avoid the error of `sh` being in the PATH (CMake version < 3.17.0).