diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-09 14:02:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-09 14:02:45 (GMT) |
| commit | e187351c5f7c1c1ef844df6be4d19bfd303266ae (patch) | |
| tree | 19966f66547c73367a2a59834a1c076047a353d8 /Help | |
| parent | 49910f1a2c9819a848b8d3b4c15d970039d7f101 (diff) | |
| parent | 2c470b775ab54f565383c95200d16dc42d94fe17 (diff) | |
| download | CMake-e187351c5f7c1c1ef844df6be4d19bfd303266ae.zip CMake-e187351c5f7c1c1ef844df6be4d19bfd303266ae.tar.gz CMake-e187351c5f7c1c1ef844df6be4d19bfd303266ae.tar.bz2 | |
Merge topic 'allow-OBJECT-library-extra-sources'
2c470b77 add_library: Allow arbitrary non-linked sources in OBJECT libraries
de4f3e2c Tests: Fix broken dependency in ObjectLibrary test
54bf5858 Tests: Resolve TODO comment left in ObjectLibrary test
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/add_library.rst | 3 | ||||
| -rw-r--r-- | Help/release/dev/allow-OBJECT-library-extra-sources.rst | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst index f19b5c0..f86f3c5 100644 --- a/Help/command/add_library.rst +++ b/Help/command/add_library.rst @@ -94,7 +94,8 @@ object library name. For example: will include objlib's object files in a library and an executable along with those compiled from their own sources. Object libraries -may contain only sources (and headers) that compile to object files. +may contain only sources that compile, header files, and other files +that would not affect linking of a normal library (e.g. ``.txt``). They may contain custom commands generating such sources, but not ``PRE_BUILD``, ``PRE_LINK``, or ``POST_BUILD`` commands. Object libraries cannot be imported, exported, installed, or linked. Some native build diff --git a/Help/release/dev/allow-OBJECT-library-extra-sources.rst b/Help/release/dev/allow-OBJECT-library-extra-sources.rst new file mode 100644 index 0000000..472fcdc --- /dev/null +++ b/Help/release/dev/allow-OBJECT-library-extra-sources.rst @@ -0,0 +1,6 @@ +allow-OBJECT-library-extra-sources +---------------------------------- + +* :ref:`Object Libraries` may now have extra sources that do not + compile to object files so long as they would not affect linking + of a normal library (e.g. ``.dat`` is okay but not ``.def``). |