summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-11 15:44:20 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-11-11 15:44:20 (GMT)
commita0b159685ea4383255e46de5456d6a9204457c1f (patch)
tree81f89a516293c1e47ce9f0426f58d01a1fa996a5 /Help
parent5733d3fbb96a0f48b58b44e5b256ec1978cbbf61 (diff)
parent883bd34a1fa31273929c7baf2f43b3c6f5ec0c01 (diff)
downloadCMake-a0b159685ea4383255e46de5456d6a9204457c1f.zip
CMake-a0b159685ea4383255e46de5456d6a9204457c1f.tar.gz
CMake-a0b159685ea4383255e46de5456d6a9204457c1f.tar.bz2
Merge topic 'vs_targets_file_as_library'
883bd34a VS: Treat libraries ending in `.targets` as msbuild imports
Diffstat (limited to 'Help')
-rw-r--r--Help/command/target_link_libraries.rst5
-rw-r--r--Help/release/dev/vs_targets_file_as_library.rst6
2 files changed, 11 insertions, 0 deletions
diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst
index 90b6575..30d69f2 100644
--- a/Help/command/target_link_libraries.rst
+++ b/Help/command/target_link_libraries.rst
@@ -53,6 +53,11 @@ Each ``<item>`` may be:
:ref:`usage requirement <Target Usage Requirements>`. This has the same
effect as passing the framework directory as an include directory.
+ On :ref:`Visual Studio Generators` for VS 2010 and above, library files
+ ending in ``.targets`` will be treated as MSBuild targets files and
+ imported into generated project files. This is not supported by other
+ generators.
+
* **A plain library name**: The generated link line will ask the linker
to search for the library (e.g. ``foo`` becomes ``-lfoo`` or ``foo.lib``).
diff --git a/Help/release/dev/vs_targets_file_as_library.rst b/Help/release/dev/vs_targets_file_as_library.rst
new file mode 100644
index 0000000..9c923fa
--- /dev/null
+++ b/Help/release/dev/vs_targets_file_as_library.rst
@@ -0,0 +1,6 @@
+vs_targets_file_as_library
+--------------------------
+
+* :ref:`Visual Studio Generators` learned to treat files passed to
+ :command:`target_link_libraries` whose names end in ``.targets``
+ as MSBuild targets files to be imported into generated project files.