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 /Modules | |
| 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 'Modules')
| -rw-r--r-- | Modules/CPackIFW.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindQt4.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index 4b8dc1e..6f2eeb3 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -96,7 +96,7 @@ # # If this is ``ON`` all components will be downloaded. # By default is ``OFF`` or used value -# from :variable:`CPACK_DOWNLOAD_ALL` if set +# from ``CPACK_DOWNLOAD_ALL`` if set # # Components # """""""""" diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index c715c81..a79246a 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -23,7 +23,7 @@ # .. note:: # # When using :prop_tgt:`IMPORTED` targets, the qtmain.lib static library is -# automatically linked on Windows for :variable:`WIN32 <WIN32_EXECUTABLE>` +# automatically linked on Windows for :prop_tgt:`WIN32 <WIN32_EXECUTABLE>` # executables. To disable that globally, set the # ``QT4_NO_LINK_QTMAIN`` variable before finding Qt4. To disable that # for a particular executable, set the ``QT4_NO_LINK_QTMAIN`` target |