summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-05-23 12:52:12 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-05-23 12:57:36 (GMT)
commitcbd1c5b4ab16fa3e1086417f010e7bbad42cc50d (patch)
tree05336f9f3d4239bfea61613fb06a1abb794cf1d2 /Help
parent79c6a573f4c6690914511e4e1894221a94f1b3e3 (diff)
parent26ea022c3bf081d9e1f7266e5ae52719cb59301b (diff)
downloadCMake-cbd1c5b4ab16fa3e1086417f010e7bbad42cc50d.zip
CMake-cbd1c5b4ab16fa3e1086417f010e7bbad42cc50d.tar.gz
CMake-cbd1c5b4ab16fa3e1086417f010e7bbad42cc50d.tar.bz2
Merge topic 'framework-var'
26ea022c3b Add variable CMAKE_FRAMEWORK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3347
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-variables.7.rst1
-rw-r--r--Help/release/dev/CMAKE_FRAMEWORK.rst6
-rw-r--r--Help/variable/CMAKE_FRAMEWORK.rst7
3 files changed, 14 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 1011ed2..75ddd5d 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -351,6 +351,7 @@ Variables that Control the Build
/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG_INIT
/variable/CMAKE_EXE_LINKER_FLAGS_INIT
/variable/CMAKE_FOLDER
+ /variable/CMAKE_FRAMEWORK
/variable/CMAKE_Fortran_FORMAT
/variable/CMAKE_Fortran_MODULE_DIRECTORY
/variable/CMAKE_GHS_NO_SOURCE_GROUP_FILE
diff --git a/Help/release/dev/CMAKE_FRAMEWORK.rst b/Help/release/dev/CMAKE_FRAMEWORK.rst
new file mode 100644
index 0000000..0253e04
--- /dev/null
+++ b/Help/release/dev/CMAKE_FRAMEWORK.rst
@@ -0,0 +1,6 @@
+CMAKE_FRAMEWORK
+---------------
+
+* A :variable:`CMAKE_FRAMEWORK` variable was added to
+ initialize the :prop_tgt:`FRAMEWORK` property on all
+ targets.
diff --git a/Help/variable/CMAKE_FRAMEWORK.rst b/Help/variable/CMAKE_FRAMEWORK.rst
new file mode 100644
index 0000000..591041c
--- /dev/null
+++ b/Help/variable/CMAKE_FRAMEWORK.rst
@@ -0,0 +1,7 @@
+CMAKE_FRAMEWORK
+---------------
+
+Default value for :prop_tgt:`FRAMEWORK` of targets.
+
+This variable is used to initialize the :prop_tgt:`FRAMEWORK` property on
+all the targets. See that target property for additional information.