diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-03 16:51:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-03 16:51:51 (GMT) |
| commit | 93054aa84f283de17c58fa2ee19a2a4a1668027d (patch) | |
| tree | 8b53dac2eb3a77909458cba210a6873915fb45ab /Help/manual | |
| parent | 1d4366ffac5814441c440d2832d9d8f187841113 (diff) | |
| parent | 5de63265e3a22d9a8aa5ad437a5030ccfcbcd02d (diff) | |
| download | CMake-93054aa84f283de17c58fa2ee19a2a4a1668027d.zip CMake-93054aa84f283de17c58fa2ee19a2a4a1668027d.tar.gz CMake-93054aa84f283de17c58fa2ee19a2a4a1668027d.tar.bz2 | |
Merge topic 'target-sources-refactor'
5de63265 Genex: Only evaluate TARGET_OBJECTS to determine target sources.
aa0a3562 cmGeneratorTarget: Compute target objects on demand
042c1c83 cmTarget: Compute languages from object libraries on demand.
fdcefe3c cmGeneratorTarget: Compute consumed object libraries on demand.
c355d108 cmComputeTargetDepends: Track object library depends.
e5da9e51 cmTarget: Allow any generator expression in SOURCES property.
5702e106 cmTarget: Include TARGET_OBJECTS genex in target SOURCES property.
857d30b5 cmGlobalGenerator: Add interface to call ForceLinkerLanguages
28e1d2f8 cmStringCommand: Add GENEX_STRIP subcommand.
bf98cc25 Genex: Evaluate TARGET_OBJECTS as a normal expression.
8cd113ad cmTarget: Store strings instead of cmSourceFile* to represent SOURCES.
4959f341 cmSourceFileLocation: Collapse full path for directory comparisons.
fcc92878 cmSourceFileLocation: Remove unused Update method.
59e8740a cmTarget: Remove AddSourceFile method
26d494ba cmTarget: Use string API to add sources to cmTarget objects.
d38423ec cmTarget: Add a method to obtain list of filenames for sources.
...
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-generator-expressions.7.rst | 5 | ||||
| -rw-r--r-- | Help/manual/cmake-policies.7.rst | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst index ac8c3f8..dfda8dc 100644 --- a/Help/manual/cmake-generator-expressions.7.rst +++ b/Help/manual/cmake-generator-expressions.7.rst @@ -188,3 +188,8 @@ property is non-empty:: Content of ``...`` converted to upper case. ``$<MAKE_C_IDENTIFIER:...>`` Content of ``...`` converted to a C identifier. +``$<TARGET_OBJECTS:objLib>`` + List of objects resulting from build of ``objLib``. ``objLib`` must be an + object of type ``OBJECT_LIBRARY``. This expression may only be used in + the sources of :command:`add_library` and :command:`add_executable` + commands. diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst index 8650a58..b763882 100644 --- a/Help/manual/cmake-policies.7.rst +++ b/Help/manual/cmake-policies.7.rst @@ -102,3 +102,4 @@ All Policies /policy/CMP0048 /policy/CMP0049 /policy/CMP0050 + /policy/CMP0051 |