summaryrefslogtreecommitdiffstats
path: root/Help/command
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-23 12:19:57 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-23 12:19:57 (GMT)
commit8855bf53959331a290fe8947eb23afd719a52cf4 (patch)
tree66b34b980fbceb5616d6c3f26056d153d7da4ba0 /Help/command
parent078530b4481e0f311e9180bf02cded228809076d (diff)
parent6c9194488aa5d61774ffeb40f54149ce2255f00c (diff)
downloadCMake-8855bf53959331a290fe8947eb23afd719a52cf4.zip
CMake-8855bf53959331a290fe8947eb23afd719a52cf4.tar.gz
CMake-8855bf53959331a290fe8947eb23afd719a52cf4.tar.bz2
Merge topic 'remove-old-commands-by-policy'
6c91944 Add policy CMP0036 to disallow build_name 3969bb2 Add policy CMP0035 to disallow variable_requires 178b9af Add policy CMP0034 to disallow utility_source 248d1dc Add policy CMP0033 to disallow export_library_dependencies 6865c8f Add policy CMP0032 to disallow output_required_files aa76518 Add policy CMP0031 to disallow load_command 97268cf Add policy CMP0030 to disallow use_mangled_mesa 9f64fbf Add policy CMP0029 to disallow subdir_depends 882c0f0 Add infrastructure for policies that disallow commands
Diffstat (limited to 'Help/command')
-rw-r--r--Help/command/build_name.rst4
-rw-r--r--Help/command/export_library_dependencies.rst4
-rw-r--r--Help/command/load_command.rst2
-rw-r--r--Help/command/output_required_files.rst4
-rw-r--r--Help/command/subdir_depends.rst4
-rw-r--r--Help/command/use_mangled_mesa.rst2
-rw-r--r--Help/command/utility_source.rst2
-rw-r--r--Help/command/variable_requires.rst4
8 files changed, 21 insertions, 5 deletions
diff --git a/Help/command/build_name.rst b/Help/command/build_name.rst
index 2148e49..53cd05e 100644
--- a/Help/command/build_name.rst
+++ b/Help/command/build_name.rst
@@ -1,7 +1,9 @@
build_name
----------
-Deprecated. Use ${CMAKE_SYSTEM} and ${CMAKE_CXX_COMPILER} instead.
+Disallowed. See CMake Policy :policy:`CMP0036`.
+
+Use ${CMAKE_SYSTEM} and ${CMAKE_CXX_COMPILER} instead.
::
diff --git a/Help/command/export_library_dependencies.rst b/Help/command/export_library_dependencies.rst
index c09f3d5..73c0b42 100644
--- a/Help/command/export_library_dependencies.rst
+++ b/Help/command/export_library_dependencies.rst
@@ -1,7 +1,9 @@
export_library_dependencies
---------------------------
-Deprecated. Use INSTALL(EXPORT) or EXPORT command.
+Disallowed. See CMake Policy :policy:`CMP0033`.
+
+Use :command:`install(EXPORT)` or :command:`export` command.
This command generates an old-style library dependencies file.
Projects requiring CMake 2.6 or later should not use the command. Use
diff --git a/Help/command/load_command.rst b/Help/command/load_command.rst
index 63f23be..fc316d4 100644
--- a/Help/command/load_command.rst
+++ b/Help/command/load_command.rst
@@ -1,6 +1,8 @@
load_command
------------
+Disallowed. See CMake Policy :policy:`CMP0031`.
+
Load a command into a running CMake.
::
diff --git a/Help/command/output_required_files.rst b/Help/command/output_required_files.rst
index d6bce13..5e13557 100644
--- a/Help/command/output_required_files.rst
+++ b/Help/command/output_required_files.rst
@@ -1,7 +1,9 @@
output_required_files
---------------------
-Deprecated. Approximate C preprocessor dependency scanning.
+Disallowed. See CMake Policy :policy:`CMP0032`.
+
+Approximate C preprocessor dependency scanning.
This command exists only because ancient CMake versions provided it.
CMake handles preprocessor dependency scanning automatically using a
diff --git a/Help/command/subdir_depends.rst b/Help/command/subdir_depends.rst
index c72a4af..5676c8f 100644
--- a/Help/command/subdir_depends.rst
+++ b/Help/command/subdir_depends.rst
@@ -1,7 +1,9 @@
subdir_depends
--------------
-Deprecated. Does nothing.
+Disallowed. See CMake Policy :policy:`CMP0029`.
+
+Does nothing.
::
diff --git a/Help/command/use_mangled_mesa.rst b/Help/command/use_mangled_mesa.rst
index a4d77e9..6f4d7ac 100644
--- a/Help/command/use_mangled_mesa.rst
+++ b/Help/command/use_mangled_mesa.rst
@@ -1,6 +1,8 @@
use_mangled_mesa
----------------
+Disallowed. See CMake Policy :policy:`CMP0030`.
+
Copy mesa headers for use in combination with system GL.
::
diff --git a/Help/command/utility_source.rst b/Help/command/utility_source.rst
index e513627..5122e52 100644
--- a/Help/command/utility_source.rst
+++ b/Help/command/utility_source.rst
@@ -1,6 +1,8 @@
utility_source
--------------
+Disallowed. See CMake Policy :policy:`CMP0034`.
+
Specify the source tree of a third-party utility.
::
diff --git a/Help/command/variable_requires.rst b/Help/command/variable_requires.rst
index 7535e40..831dd00 100644
--- a/Help/command/variable_requires.rst
+++ b/Help/command/variable_requires.rst
@@ -1,7 +1,9 @@
variable_requires
-----------------
-Deprecated. Use the if() command instead.
+Disallowed. See CMake Policy :policy:`CMP0035`.
+
+Use the if() command instead.
Assert satisfaction of an option's required variables.