Skip to content

Commit e42d59b

Browse files
danimtblasote
authored andcommitted
Bring back CONAN_DISABLE_CHECK_COMPILER for cmake generator (conan-io#1331)
* Bring back CONAN_DISABLE_CHECK_COMPILER for cmake generator * fix description of methods
1 parent 61e33e2 commit e42d59b

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

reference/generators/cmake.rst

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,55 +159,59 @@ These targets are:
159159
- Each ``CONAN_LIB`` depends on the direct public dependencies ``CONAN_PKG`` targets of its container package. This guarantees correct link
160160
order.
161161

162+
.. _conan_check_compiler:
163+
162164
conan_check_compiler()
163165
++++++++++++++++++++++
164166

165167
Checks that your compiler matches the one declared in settings.
166168

169+
This method can be disabled setting the :ref:`conan_disable_check_compiler` variable.
170+
167171
conan_output_dirs_setup()
168172
+++++++++++++++++++++++++
169173

170-
Adjust the *bin/* and *lib/* output directories.
174+
Adjusts the *bin/* and *lib/* output directories.
171175

172176
conan_set_find_library_paths()
173177
++++++++++++++++++++++++++++++
174178

175-
Set ``CMAKE_INCLUDE_PATH`` and ``CMAKE_INCLUDE_PATH``.
179+
Sets ``CMAKE_INCLUDE_PATH`` and ``CMAKE_INCLUDE_PATH``.
176180

177181
conan_global_flags()
178182
++++++++++++++++++++
179183

180-
Set the corresponding variables to CMake's ``include_directories()`` and ``link_directories()``.
184+
Sets the corresponding variables to CMake's ``include_directories()`` and ``link_directories()``.
181185

182186
conan_define_targets()
183187
++++++++++++++++++++++
184188

185-
Define the targets for each dependency (target flags instead of global flags).
189+
Defines the targets for each dependency (target flags instead of global flags).
186190

187191
conan_set_rpath()
188192
+++++++++++++++++
189193

190-
Set ``CMAKE_SKIP_RPATH=1`` in the case of working in OSX.
194+
Sets ``CMAKE_SKIP_RPATH=1`` in the case of working in OSX.
191195

192196
conan_set_vs_runtime()
193197
++++++++++++++++++++++
194198

195-
Adjust the runtime flags ``/MD``, ``/MDd``, ``/MT`` or ``/MTd`` for Visual Studio.
199+
Adjusts the runtime flags ``/MD``, ``/MDd``, ``/MT`` or ``/MTd`` for Visual Studio.
196200

197201
conan_set_std()
198202
+++++++++++++++
199203

200-
Set ``CMAKE_CXX_STANDARD`` and ``CMAKE_CXX_EXTENSIONS`` to the appropriate values.
204+
Sets ``CMAKE_CXX_STANDARD`` and ``CMAKE_CXX_EXTENSIONS`` to the appropriate values.
201205

202206
conan_set_libcxx()
203207
++++++++++++++++++
204208

205-
Adjust the standard library flags (``libc++```, ``libstdc++``, ``libstdc++11``) in ``CMAKE_CXX_FLAGS``.
209+
Adjusts the standard library flags (``libc++```, ``libstdc++``, ``libstdc++11``) in ``CMAKE_CXX_FLAGS``.
206210

207211
conan_set_find_paths()
208212
++++++++++++++++++++++
209213

210-
Adjust ``CMAKE_MODULE_PATH`` and ``CMAKE_PREFIX_PATH`` to the values of ``deps_cpp_info.build_paths``.
214+
Adjusts ``CMAKE_MODULE_PATH`` and ``CMAKE_PREFIX_PATH`` to the values of ``deps_cpp_info.build_paths``.
211215

212216
Input variables for *conanbuildinfo.cmake*
213217
------------------------------------------
@@ -218,3 +222,12 @@ CONAN_CMAKE_SILENT_OUTPUT
218222
**Default to**: ``FALSE``
219223

220224
Activate it to silence the Conan message output.
225+
226+
.. _conan_disable_check_compiler:
227+
228+
CONAN_DISABLE_CHECK_COMPILER
229+
++++++++++++++++++++++++++++
230+
231+
**Default to**: ``FALSE``
232+
233+
Deactivates the check of the compiler done with the method :ref:`conan_check_compiler`.

0 commit comments

Comments
 (0)