summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-02-06 16:10:24 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-02-06 16:10:24 (GMT)
commit0795aed6380dfbacec2b46c2031c3802be3bdc7c (patch)
treea93ea2169ac246fc5a569755f35ec56c6a50b9d9
parentd5c54d0069224000b28ad942fbf84a3de8729970 (diff)
parent0f5dfd10ba430fc9377654ca8cf3f636901aa223 (diff)
downloadCMake-0795aed6380dfbacec2b46c2031c3802be3bdc7c.zip
CMake-0795aed6380dfbacec2b46c2031c3802be3bdc7c.tar.gz
CMake-0795aed6380dfbacec2b46c2031c3802be3bdc7c.tar.bz2
Merge topic 'Qt4-WIN32-doc'
0f5dfd10 Help: Specify that qtmain.lib is only used for WIN32 executables.
-rw-r--r--Modules/FindQt4.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 9ea77d4..e188c62 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -23,7 +23,8 @@
# .. note::
#
# When using :prop_tgt:`IMPORTED` targets, the qtmain.lib static library is
-# automatically linked on Windows. To disable that globally, set the
+# automatically linked on Windows for :variable:`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
# property to ``TRUE`` on the executable.