summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-03-23 13:18:29 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-03-23 13:18:29 (GMT)
commita37937f7c0a37626298ccc80cffe5ec9fd26aa75 (patch)
tree74a3c4ca11b69ec061d3a81450e3b442aaabf2f1 /Help/manual
parentcc8b8cdc751ff2dfa6e77a69da542d6aef066346 (diff)
parent4178cd88fc01bd38fde2f3ee7a1702cfb4808f93 (diff)
downloadCMake-a37937f7c0a37626298ccc80cffe5ec9fd26aa75.zip
CMake-a37937f7c0a37626298ccc80cffe5ec9fd26aa75.tar.gz
CMake-a37937f7c0a37626298ccc80cffe5ec9fd26aa75.tar.bz2
Merge topic 'xcode-xctest'
4178cd88 Help: Add notes for topic 'xcode-xctest' 87a4b858 Tests: Add XCTest example to test Frameworks and Cocoa App Bundles ba14510b OS X: Add FindXCTest module 3714955b OS X: Add handling for XCTest bundles 54a5cdbb Tests: Compute Xcode version for any generator on OS X
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-modules.7.rst1
-rw-r--r--Help/manual/cmake-properties.7.rst1
2 files changed, 2 insertions, 0 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 2b26cc9..c9219d5 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -212,6 +212,7 @@ All Modules
/module/FindWish
/module/FindwxWidgets
/module/FindwxWindows
+ /module/FindXCTest
/module/FindXercesC
/module/FindX11
/module/FindXMLRPC
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 19fdf23..1dff33e 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -243,6 +243,7 @@ Properties on Targets
/prop_tgt/VS_WINRT_REFERENCES
/prop_tgt/WIN32_EXECUTABLE
/prop_tgt/XCODE_ATTRIBUTE_an-attribute
+ /prop_tgt/XCTEST
Properties on Tests
===================