Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docs for cmake_multi generator #1121

Merged
merged 7 commits into from
Mar 27, 2019
Merged

Docs for cmake_multi generator #1121

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a23a5a3
Fix link
danimtb Mar 14, 2019
7c7eeee
Refactor cmake generator section
danimtb Mar 14, 2019
f9d171d
Docs for cmake_multi generator
danimtb Mar 15, 2019
b3e230e
Merge branch 'develop' into feature/conan/2820
danimtb Mar 15, 2019
2eb3111
Removed usage and fix title
danimtb Mar 15, 2019
a96243a
fix underline
danimtb Mar 18, 2019
b2bd9bc
Merge branch 'develop' into feature/conan/2820
danimtb Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reference/config_files/conan.conf.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The typical location of the **conan.conf** file is the directory ``~/.conan/``:
# conan_cmake_program = cmake # environment CONAN_CMAKE_PROGRAM (overrides the make program used in CMake.cmake_program)

# cmake_generator # environment CONAN_CMAKE_GENERATOR
# http://www.vtk.org/Wiki/CMake_Cross_Compiling
# https://vtk.org/Wiki/CMake_Cross_Compiling
# cmake_toolchain_file # environment CONAN_CMAKE_TOOLCHAIN_FILE
# cmake_system_name # environment CONAN_CMAKE_SYSTEM_NAME
# cmake_system_version # environment CONAN_CMAKE_SYSTEM_VERSION
Expand Down
5 changes: 3 additions & 2 deletions reference/generators.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ generated contains information of dependencies in form of different variables an

You can specify a generator in:

- The ``[generators]`` section from :ref:`conanfile.txt<conanfile_txt_reference>`
- The ``generators`` attribute in :ref:`conanfile.py<conanfile_reference>`
- The ``[generators]`` section from :ref:`conanfile.txt<conanfile_txt_reference>`.
- The ``generators`` attribute in :ref:`conanfile.py<conanfile_reference>`.
- The command line when installing dependencies :command:`conan install --generator`.

Available generators:

Expand Down
Loading