Skip to content

Commit

Permalink
fix conandeps.props
Browse files Browse the repository at this point in the history
  • Loading branch information
memsharded committed Sep 29, 2021
1 parent 9246bb2 commit 8e1b2b9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion reference/conanfile/tools/microsoft.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ configuration. The above commands the following files will be generated:
- *conandeps.props*: Properties files including all direct dependencies, in this case, it includes ``conan_zlib.props``
and ``conan_bzip2.props``

You will be adding the *conan_deps.props* to your solution project files if you want to depend on all the declared
You will be adding the *conandeps.props* to your solution project files if you want to depend on all the declared
dependencies. For single project solutions, this is probably the way to go. For multi-project solutions, you might
be more efficient and add properties files per project. You could add *conan_zlib.props* properties to "project1"
in the solution and *conan_bzip2.props* to "project2" in the solution for example.
Expand Down
10 changes: 5 additions & 5 deletions reference/generators/msbuild.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ that can be added to the projects and solutions in the IDE, under the "propertie
If a conanfile declares two requirements ``"zlib/1.2.11", "poco/1.9.4"``, then
running the :command:`conan install -g=msbuild` will create the following files:

- One properties file for each dependency and transitive dependency, like *conan_zlib.props*,
*conan_openssl.props*and *conan_poco.props*. These files will transitively import other files,
- One properties file for each dependency and transitive dependency, like *conan_zlib.props*,
*conan_openssl.props* and *conan_poco.props*. These files will transitively import other files,
in this case as the ``poco`` package depends on ``openssl``, the *conan_poco.props* will import
*conan_openssl.props* file.
- One file for each dependency for each configuration, like *conan_zlib_release_x64_v141.props*,
containing the corresponding variables (include folders, library folders, library name, etc.)
for that configuration, like the ``<ConanzlibIncludeDirectories>`` variable. These files are
conditionally included per configuration by the base dependency file (*conan_zlib.props*).
- One *conan_deps.props* Visual Studio properties file, importing all the direct
for that configuration, like the ``<ConanzlibIncludeDirectories>`` variable. These files are
conditionally included per configuration by the base dependency file (*conan_zlib.props*).
- One *conandeps.props* Visual Studio properties file, importing all the direct
dependencies, in this example both *conan_zlib.props* and *conan_poco.props*.


Expand Down

0 comments on commit 8e1b2b9

Please sign in to comment.