diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-07 16:45:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-07 16:45:27 (GMT) |
| commit | 06c3b7a8224b9864f1771de62926c1d1fb3476cc (patch) | |
| tree | 242997b0c068a51dc27471888d23ac4d9fc4a3ea /Help | |
| parent | 3dfc856b7917c763a822f31dd6c4c7afad5d0626 (diff) | |
| parent | 4c8c442d7c2e61e87be9dd29ddfe2c4e4821df9f (diff) | |
| download | CMake-06c3b7a8224b9864f1771de62926c1d1fb3476cc.zip CMake-06c3b7a8224b9864f1771de62926c1d1fb3476cc.tar.gz CMake-06c3b7a8224b9864f1771de62926c1d1fb3476cc.tar.bz2 | |
Merge branch 'doc-cleanup-xrefs' into release
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/command/target_compile_options.rst | 4 | ||||
| -rw-r--r-- | Help/command/target_sources.rst | 2 | ||||
| -rw-r--r-- | Help/prop_sf/AUTOUIC_OPTIONS.rst | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Help/command/target_compile_options.rst b/Help/command/target_compile_options.rst index 0fdeba6..3362c5d 100644 --- a/Help/command/target_compile_options.rst +++ b/Help/command/target_compile_options.rst @@ -12,8 +12,8 @@ Add compile options to a target. Specify compile options to use when compiling a given target. The named ``<target>`` must have been created by a command such as :command:`add_executable` or :command:`add_library` and must not be an -:prop_tgt:`IMPORTED Target`. If ``BEFORE`` is specified, the content will -be prepended to the property instead of being appended. +:ref:`IMPORTED Target <Imported Targets>`. If ``BEFORE`` is specified, +the content will be prepended to the property instead of being appended. This command can be used to add any options, but alternative commands exist to add preprocessor definitions diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst index ff756b4..d6f148d 100644 --- a/Help/command/target_sources.rst +++ b/Help/command/target_sources.rst @@ -12,7 +12,7 @@ Add sources to a target. Specify sources to use when compiling a given target. The named ``<target>`` must have been created by a command such as :command:`add_executable` or :command:`add_library` and must not be an -:prop_tgt:`IMPORTED Target`. +:ref:`IMPORTED Target <Imported Targets>`. The ``INTERFACE``, ``PUBLIC`` and ``PRIVATE`` keywords are required to specify the scope of the following arguments. ``PRIVATE`` and ``PUBLIC`` diff --git a/Help/prop_sf/AUTOUIC_OPTIONS.rst b/Help/prop_sf/AUTOUIC_OPTIONS.rst index 6dfabb0..bb48da9 100644 --- a/Help/prop_sf/AUTOUIC_OPTIONS.rst +++ b/Help/prop_sf/AUTOUIC_OPTIONS.rst @@ -6,7 +6,7 @@ Additional options for ``uic`` when using :prop_tgt:`AUTOUIC` This property holds additional command line options which will be used when ``uic`` is executed during the build via :prop_tgt:`AUTOUIC`, i.e. it is equivalent to the optional ``OPTIONS`` argument of the -:module:`qt4_wrap_ui()<FindQt4>` macro. +:module:`qt4_wrap_ui() <FindQt4>` macro. By default it is empty. |