[Cmake-commits] CMake branch, next, updated. v3.2.2-2624-g6139efe
Brad King
brad.king at kitware.com
Fri May 8 08:30:31 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 6139efe62ff057a9d1eb2394e8ca300851003e66 (commit)
via 989309ef5e7c60e7a04bfc7d8a9a54154bd18928 (commit)
from d4fb98f23ae1d83ad732f36f03f40e6303e512d4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6139efe62ff057a9d1eb2394e8ca300851003e66
commit 6139efe62ff057a9d1eb2394e8ca300851003e66
Merge: d4fb98f 989309e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 08:30:28 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 8 08:30:28 2015 -0400
Merge topic 'improve-policies-documentation' into next
989309ef Revert topic 'improve-policies-documentation'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=989309ef5e7c60e7a04bfc7d8a9a54154bd18928
commit 989309ef5e7c60e7a04bfc7d8a9a54154bd18928
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri May 8 08:30:14 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri May 8 08:30:14 2015 -0400
Revert topic 'improve-policies-documentation'
It will be revised and restored.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index a2aedd4..aff696d 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -54,4 +54,67 @@ functions.
All Policies
============
-.. cmake-policy-list::
+.. toctree::
+ :maxdepth: 1
+
+ /policy/CMP0000
+ /policy/CMP0001
+ /policy/CMP0002
+ /policy/CMP0003
+ /policy/CMP0004
+ /policy/CMP0005
+ /policy/CMP0006
+ /policy/CMP0007
+ /policy/CMP0008
+ /policy/CMP0009
+ /policy/CMP0010
+ /policy/CMP0011
+ /policy/CMP0012
+ /policy/CMP0013
+ /policy/CMP0014
+ /policy/CMP0015
+ /policy/CMP0016
+ /policy/CMP0017
+ /policy/CMP0018
+ /policy/CMP0019
+ /policy/CMP0020
+ /policy/CMP0021
+ /policy/CMP0022
+ /policy/CMP0023
+ /policy/CMP0024
+ /policy/CMP0025
+ /policy/CMP0026
+ /policy/CMP0027
+ /policy/CMP0028
+ /policy/CMP0029
+ /policy/CMP0030
+ /policy/CMP0031
+ /policy/CMP0032
+ /policy/CMP0033
+ /policy/CMP0034
+ /policy/CMP0035
+ /policy/CMP0036
+ /policy/CMP0037
+ /policy/CMP0038
+ /policy/CMP0039
+ /policy/CMP0040
+ /policy/CMP0041
+ /policy/CMP0042
+ /policy/CMP0043
+ /policy/CMP0044
+ /policy/CMP0045
+ /policy/CMP0046
+ /policy/CMP0047
+ /policy/CMP0048
+ /policy/CMP0049
+ /policy/CMP0050
+ /policy/CMP0051
+ /policy/CMP0052
+ /policy/CMP0053
+ /policy/CMP0054
+ /policy/CMP0055
+ /policy/CMP0056
+ /policy/CMP0057
+ /policy/CMP0058
+ /policy/CMP0059
+ /policy/CMP0060
diff --git a/Help/policy/CMP0000.rst b/Help/policy/CMP0000.rst
index e3c00e8a..9fbf842 100644
--- a/Help/policy/CMP0000.rst
+++ b/Help/policy/CMP0000.rst
@@ -1,7 +1,7 @@
CMP0000
-------
-.. cmake-policy:: CMP0000
+A minimum required CMake version must be specified.
CMake requires that projects specify the version of CMake to which
they have been written. This policy has been put in place so users
diff --git a/Help/policy/CMP0001.rst b/Help/policy/CMP0001.rst
index 34d2f7d..344f1e2 100644
--- a/Help/policy/CMP0001.rst
+++ b/Help/policy/CMP0001.rst
@@ -1,7 +1,7 @@
CMP0001
-------
-.. cmake-policy:: CMP0001
+CMAKE_BACKWARDS_COMPATIBILITY should no longer be used.
The OLD behavior is to check CMAKE_BACKWARDS_COMPATIBILITY and present
it to the user. The NEW behavior is to ignore
diff --git a/Help/policy/CMP0002.rst b/Help/policy/CMP0002.rst
index 105d1ee..2c15bd4 100644
--- a/Help/policy/CMP0002.rst
+++ b/Help/policy/CMP0002.rst
@@ -1,7 +1,7 @@
CMP0002
-------
-.. cmake-policy:: CMP0002
+Logical target names must be globally unique.
Targets names created with add_executable, add_library, or
add_custom_target are logical build target names. Logical target
diff --git a/Help/policy/CMP0003.rst b/Help/policy/CMP0003.rst
index 7c5007f..27b83f8 100644
--- a/Help/policy/CMP0003.rst
+++ b/Help/policy/CMP0003.rst
@@ -1,7 +1,7 @@
CMP0003
-------
-.. cmake-policy:: CMP0003
+Libraries linked via full path no longer produce linker search paths.
This policy affects how libraries whose full paths are NOT known are
found at link time, but was created due to a change in how CMake deals
diff --git a/Help/policy/CMP0004.rst b/Help/policy/CMP0004.rst
index b06e214..80045f5 100644
--- a/Help/policy/CMP0004.rst
+++ b/Help/policy/CMP0004.rst
@@ -1,7 +1,7 @@
CMP0004
-------
-.. cmake-policy:: CMP0004
+Libraries linked may not have leading or trailing whitespace.
CMake versions 2.4 and below silently removed leading and trailing
whitespace from libraries linked with code like
diff --git a/Help/policy/CMP0005.rst b/Help/policy/CMP0005.rst
index b86f550..c11a9e6 100644
--- a/Help/policy/CMP0005.rst
+++ b/Help/policy/CMP0005.rst
@@ -1,7 +1,7 @@
CMP0005
-------
-.. cmake-policy:: CMP0005
+Preprocessor definition values are now escaped automatically.
This policy determines whether or not CMake should generate escaped
preprocessor definition values added via add_definitions. CMake
diff --git a/Help/policy/CMP0006.rst b/Help/policy/CMP0006.rst
index abce5c5..8d1e5bd 100644
--- a/Help/policy/CMP0006.rst
+++ b/Help/policy/CMP0006.rst
@@ -1,7 +1,7 @@
CMP0006
-------
-.. cmake-policy:: CMP0006
+Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION.
This policy determines whether the install(TARGETS) command must be
given a BUNDLE DESTINATION when asked to install a target with the
diff --git a/Help/policy/CMP0007.rst b/Help/policy/CMP0007.rst
index 7cbc47d..f0d8c16 100644
--- a/Help/policy/CMP0007.rst
+++ b/Help/policy/CMP0007.rst
@@ -1,7 +1,7 @@
CMP0007
-------
-.. cmake-policy:: CMP0007
+list command no longer ignores empty elements.
This policy determines whether the list command will ignore empty
elements in the list. CMake 2.4 and below list commands ignored all
diff --git a/Help/policy/CMP0008.rst b/Help/policy/CMP0008.rst
index a02493e..b118ece 100644
--- a/Help/policy/CMP0008.rst
+++ b/Help/policy/CMP0008.rst
@@ -1,7 +1,7 @@
CMP0008
-------
-.. cmake-policy:: CMP0008
+Libraries linked by full-path must have a valid library file name.
In CMake 2.4 and below it is possible to write code like
diff --git a/Help/policy/CMP0009.rst b/Help/policy/CMP0009.rst
index f0a209e..481af1a 100644
--- a/Help/policy/CMP0009.rst
+++ b/Help/policy/CMP0009.rst
@@ -1,7 +1,7 @@
CMP0009
-------
-.. cmake-policy:: CMP0009
+FILE GLOB_RECURSE calls should not follow symlinks by default.
In CMake 2.6.1 and below, FILE GLOB_RECURSE calls would follow through
symlinks, sometimes coming up with unexpectedly large result sets
diff --git a/Help/policy/CMP0010.rst b/Help/policy/CMP0010.rst
index 1cf549b..9d2eb76 100644
--- a/Help/policy/CMP0010.rst
+++ b/Help/policy/CMP0010.rst
@@ -1,7 +1,7 @@
CMP0010
-------
-.. cmake-policy:: CMP0010
+Bad variable reference syntax is an error.
In CMake 2.6.2 and below, incorrect variable reference syntax such as
a missing close-brace ("${FOO") was reported but did not stop
diff --git a/Help/policy/CMP0011.rst b/Help/policy/CMP0011.rst
index 1ca4ff1..0f41fff 100644
--- a/Help/policy/CMP0011.rst
+++ b/Help/policy/CMP0011.rst
@@ -1,7 +1,7 @@
CMP0011
-------
-.. cmake-policy:: CMP0011
+Included scripts do automatic cmake_policy PUSH and POP.
In CMake 2.6.2 and below, CMake Policy settings in scripts loaded by
the include() and find_package() commands would affect the includer.
diff --git a/Help/policy/CMP0012.rst b/Help/policy/CMP0012.rst
index 63d1a52..7a749bf 100644
--- a/Help/policy/CMP0012.rst
+++ b/Help/policy/CMP0012.rst
@@ -1,7 +1,7 @@
CMP0012
-------
-.. cmake-policy:: CMP0012
+if() recognizes numbers and boolean constants.
In CMake versions 2.6.4 and lower the if() command implicitly
dereferenced arguments corresponding to variables, even those named
diff --git a/Help/policy/CMP0013.rst b/Help/policy/CMP0013.rst
index a6ec06a..e99997b 100644
--- a/Help/policy/CMP0013.rst
+++ b/Help/policy/CMP0013.rst
@@ -1,7 +1,7 @@
CMP0013
-------
-.. cmake-policy:: CMP0013
+Duplicate binary directories are not allowed.
CMake 2.6.3 and below silently permitted add_subdirectory() calls to
create the same binary directory multiple times. During build system
diff --git a/Help/policy/CMP0014.rst b/Help/policy/CMP0014.rst
index 8c34caa..37178d1 100644
--- a/Help/policy/CMP0014.rst
+++ b/Help/policy/CMP0014.rst
@@ -1,7 +1,7 @@
CMP0014
-------
-.. cmake-policy:: CMP0014
+Input directories must have CMakeLists.txt.
CMake versions before 2.8 silently ignored missing CMakeLists.txt
files in directories referenced by add_subdirectory() or subdirs(),
diff --git a/Help/policy/CMP0015.rst b/Help/policy/CMP0015.rst
index 5067e03..1b54979 100644
--- a/Help/policy/CMP0015.rst
+++ b/Help/policy/CMP0015.rst
@@ -1,7 +1,7 @@
CMP0015
-------
-.. cmake-policy:: CMP0015
+link_directories() treats paths relative to the source dir.
In CMake 2.8.0 and lower the link_directories() command passed
relative paths unchanged to the linker. In CMake 2.8.1 and above the
diff --git a/Help/policy/CMP0016.rst b/Help/policy/CMP0016.rst
index c818da3..743b1a9 100644
--- a/Help/policy/CMP0016.rst
+++ b/Help/policy/CMP0016.rst
@@ -1,7 +1,7 @@
CMP0016
-------
-.. cmake-policy:: CMP0016
+target_link_libraries() reports error if its only argument is not a target.
In CMake 2.8.2 and lower the target_link_libraries() command silently
ignored if it was called with only one argument, and this argument
diff --git a/Help/policy/CMP0017.rst b/Help/policy/CMP0017.rst
index 01b7d93..f74e6f0 100644
--- a/Help/policy/CMP0017.rst
+++ b/Help/policy/CMP0017.rst
@@ -1,7 +1,7 @@
CMP0017
-------
-.. cmake-policy:: CMP0017
+Prefer files from the CMake module directory when including from there.
Starting with CMake 2.8.4, if a cmake-module shipped with CMake (i.e.
located in the CMake module directory) calls include() or
diff --git a/Help/policy/CMP0018.rst b/Help/policy/CMP0018.rst
index 1ebea5e..0f68267 100644
--- a/Help/policy/CMP0018.rst
+++ b/Help/policy/CMP0018.rst
@@ -1,7 +1,7 @@
CMP0018
-------
-.. cmake-policy:: CMP0018
+Ignore CMAKE_SHARED_LIBRARY_<Lang>_FLAGS variable.
CMake 2.8.8 and lower compiled sources in SHARED and MODULE libraries
using the value of the undocumented CMAKE_SHARED_LIBRARY_<Lang>_FLAGS
diff --git a/Help/policy/CMP0019.rst b/Help/policy/CMP0019.rst
index 114c5fc..2b37fa1 100644
--- a/Help/policy/CMP0019.rst
+++ b/Help/policy/CMP0019.rst
@@ -1,7 +1,7 @@
CMP0019
-------
-.. cmake-policy:: CMP0019
+Do not re-expand variables in include and link information.
CMake 2.8.10 and lower re-evaluated values given to the
include_directories, link_directories, and link_libraries commands to
diff --git a/Help/policy/CMP0020.rst b/Help/policy/CMP0020.rst
index 4e4476c..6767d08 100644
--- a/Help/policy/CMP0020.rst
+++ b/Help/policy/CMP0020.rst
@@ -1,7 +1,7 @@
CMP0020
-------
-.. cmake-policy:: CMP0020
+Automatically link Qt executables to qtmain target on Windows.
CMake 2.8.10 and lower required users of Qt to always specify a link
dependency to the qtmain.lib static library manually on Windows.
diff --git a/Help/policy/CMP0021.rst b/Help/policy/CMP0021.rst
index 18f2b40..3f5bd03 100644
--- a/Help/policy/CMP0021.rst
+++ b/Help/policy/CMP0021.rst
@@ -1,7 +1,7 @@
CMP0021
-------
-.. cmake-policy:: CMP0021
+Fatal error on relative paths in INCLUDE_DIRECTORIES target property.
CMake 2.8.10.2 and lower allowed the INCLUDE_DIRECTORIES target
property to contain relative paths. The base path for such relative
diff --git a/Help/policy/CMP0022.rst b/Help/policy/CMP0022.rst
index b8d6ecb..22c7c4f 100644
--- a/Help/policy/CMP0022.rst
+++ b/Help/policy/CMP0022.rst
@@ -1,7 +1,7 @@
CMP0022
-------
-.. cmake-policy:: CMP0022
+INTERFACE_LINK_LIBRARIES defines the link interface.
CMake 2.8.11 constructed the 'link interface' of a target from
properties matching ``(IMPORTED_)?LINK_INTERFACE_LIBRARIES(_<CONFIG>)?``.
diff --git a/Help/policy/CMP0023.rst b/Help/policy/CMP0023.rst
index 5063787..962b624 100644
--- a/Help/policy/CMP0023.rst
+++ b/Help/policy/CMP0023.rst
@@ -1,7 +1,7 @@
CMP0023
-------
-.. cmake-policy:: CMP0023
+Plain and keyword target_link_libraries signatures cannot be mixed.
CMake 2.8.12 introduced the target_link_libraries signature using the
PUBLIC, PRIVATE, and INTERFACE keywords to generalize the LINK_PUBLIC
diff --git a/Help/policy/CMP0024.rst b/Help/policy/CMP0024.rst
index b4c4c92..ee53d5f 100644
--- a/Help/policy/CMP0024.rst
+++ b/Help/policy/CMP0024.rst
@@ -1,7 +1,7 @@
CMP0024
-------
-.. cmake-policy:: CMP0024
+Disallow include export result.
CMake 2.8.12 and lower allowed use of the include() command with the
result of the export() command. This relies on the assumption that
diff --git a/Help/policy/CMP0025.rst b/Help/policy/CMP0025.rst
index bfc4687..8d19edf 100644
--- a/Help/policy/CMP0025.rst
+++ b/Help/policy/CMP0025.rst
@@ -1,7 +1,7 @@
CMP0025
-------
-.. cmake-policy:: CMP0025
+Compiler id for Apple Clang is now ``AppleClang``.
CMake 3.0 and above recognize that Apple Clang is a different compiler
than upstream Clang and that they have different version numbers.
diff --git a/Help/policy/CMP0026.rst b/Help/policy/CMP0026.rst
index 5b42a1e..4889249 100644
--- a/Help/policy/CMP0026.rst
+++ b/Help/policy/CMP0026.rst
@@ -1,7 +1,7 @@
CMP0026
-------
-.. cmake-policy:: CMP0026
+Disallow use of the LOCATION property for build targets.
CMake 2.8.12 and lower allowed reading the LOCATION target
property (and configuration-specific variants) to
diff --git a/Help/policy/CMP0027.rst b/Help/policy/CMP0027.rst
index f2af8ac..bedaffe 100644
--- a/Help/policy/CMP0027.rst
+++ b/Help/policy/CMP0027.rst
@@ -1,7 +1,7 @@
CMP0027
-------
-.. cmake-policy:: CMP0027
+Conditionally linked imported targets with missing include directories.
CMake 2.8.11 introduced introduced the concept of
INTERFACE_INCLUDE_DIRECTORIES, and a check at cmake time that the
diff --git a/Help/policy/CMP0028.rst b/Help/policy/CMP0028.rst
index db58231..24889ec 100644
--- a/Help/policy/CMP0028.rst
+++ b/Help/policy/CMP0028.rst
@@ -1,7 +1,7 @@
CMP0028
-------
-.. cmake-policy:: CMP0028
+Double colon in target name means ALIAS or IMPORTED target.
CMake 2.8.12 and lower allowed the use of targets and files with double
colons in target_link_libraries, with some buildsystem generators.
diff --git a/Help/policy/CMP0029.rst b/Help/policy/CMP0029.rst
index 70a8909..8f58a12 100644
--- a/Help/policy/CMP0029.rst
+++ b/Help/policy/CMP0029.rst
@@ -1,7 +1,7 @@
CMP0029
-------
-.. cmake-policy:: CMP0029
+The :command:`subdir_depends` command should not be called.
The implementation of this command has been empty since December 2001
but was kept in CMake for compatibility for a long time.
diff --git a/Help/policy/CMP0030.rst b/Help/policy/CMP0030.rst
index 98bc070..9e31b38 100644
--- a/Help/policy/CMP0030.rst
+++ b/Help/policy/CMP0030.rst
@@ -1,7 +1,7 @@
CMP0030
-------
-.. cmake-policy:: CMP0030
+The :command:`use_mangled_mesa` command should not be called.
This command was created in September 2001 to support VTK before
modern CMake language and custom command capabilities. VTK has
diff --git a/Help/policy/CMP0031.rst b/Help/policy/CMP0031.rst
index 857eb16..6b89558 100644
--- a/Help/policy/CMP0031.rst
+++ b/Help/policy/CMP0031.rst
@@ -1,7 +1,7 @@
CMP0031
-------
-.. cmake-policy:: CMP0031
+The :command:`load_command` command should not be called.
This command was added in August 2002 to allow projects to add
arbitrary commands implemented in C or C++. However, it does
diff --git a/Help/policy/CMP0032.rst b/Help/policy/CMP0032.rst
index e4e59d5..f394a06 100644
--- a/Help/policy/CMP0032.rst
+++ b/Help/policy/CMP0032.rst
@@ -1,7 +1,7 @@
CMP0032
-------
-.. cmake-policy:: CMP0032
+The :command:`output_required_files` command should not be called.
This command was added in June 2001 to expose the then-current CMake
implicit dependency scanner. CMake's real implicit dependency scanner
diff --git a/Help/policy/CMP0033.rst b/Help/policy/CMP0033.rst
index 7709d81..b420065 100644
--- a/Help/policy/CMP0033.rst
+++ b/Help/policy/CMP0033.rst
@@ -1,7 +1,7 @@
CMP0033
-------
-.. cmake-policy:: CMP0033
+The :command:`export_library_dependencies` command should not be called.
This command was added in January 2003 to export ``<tgt>_LIB_DEPENDS``
internal CMake cache entries to a file for installation with a project.
diff --git a/Help/policy/CMP0034.rst b/Help/policy/CMP0034.rst
index 3755d08..2133997 100644
--- a/Help/policy/CMP0034.rst
+++ b/Help/policy/CMP0034.rst
@@ -1,7 +1,7 @@
CMP0034
-------
-.. cmake-policy:: CMP0034
+The :command:`utility_source` command should not be called.
This command was introduced in March 2001 to help build executables used to
generate other files. This approach has long been replaced by
diff --git a/Help/policy/CMP0035.rst b/Help/policy/CMP0035.rst
index 75b8189..7335b22 100644
--- a/Help/policy/CMP0035.rst
+++ b/Help/policy/CMP0035.rst
@@ -1,7 +1,7 @@
CMP0035
-------
-.. cmake-policy:: CMP0035
+The :command:`variable_requires` command should not be called.
This command was introduced in November 2001 to perform some conditional
logic. It has long been replaced by the :command:`if` command.
diff --git a/Help/policy/CMP0036.rst b/Help/policy/CMP0036.rst
index be13726..817f156 100644
--- a/Help/policy/CMP0036.rst
+++ b/Help/policy/CMP0036.rst
@@ -1,7 +1,7 @@
CMP0036
-------
-.. cmake-policy:: CMP0036
+The :command:`build_name` command should not be called.
This command was added in May 2001 to compute a name for the current
operating system and compiler combination. The command has long been
diff --git a/Help/policy/CMP0037.rst b/Help/policy/CMP0037.rst
index 3107e50..4d485bf 100644
--- a/Help/policy/CMP0037.rst
+++ b/Help/policy/CMP0037.rst
@@ -1,7 +1,7 @@
CMP0037
-------
-.. cmake-policy:: CMP0037
+Target names should not be reserved and should match a validity pattern.
CMake 2.8.12 and lower allowed creating targets using :command:`add_library`,
:command:`add_executable` and :command:`add_custom_target` with unrestricted
diff --git a/Help/policy/CMP0038.rst b/Help/policy/CMP0038.rst
index b094db3..df5af6a 100644
--- a/Help/policy/CMP0038.rst
+++ b/Help/policy/CMP0038.rst
@@ -1,7 +1,7 @@
CMP0038
-------
-.. cmake-policy:: CMP0038
+Targets may not link directly to themselves.
CMake 2.8.12 and lower allowed a build target to link to itself directly with
a :command:`target_link_libraries` call. This is an indicator of a bug in
diff --git a/Help/policy/CMP0039.rst b/Help/policy/CMP0039.rst
index 4477d2a..58ccc41 100644
--- a/Help/policy/CMP0039.rst
+++ b/Help/policy/CMP0039.rst
@@ -1,7 +1,7 @@
CMP0039
-------
-.. cmake-policy:: CMP0039
+Utility targets may not have link dependencies.
CMake 2.8.12 and lower allowed using utility targets in the left hand side
position of the :command:`target_link_libraries` command. This is an indicator
diff --git a/Help/policy/CMP0040.rst b/Help/policy/CMP0040.rst
index 7e72ee2..77a3c81 100644
--- a/Help/policy/CMP0040.rst
+++ b/Help/policy/CMP0040.rst
@@ -1,7 +1,7 @@
CMP0040
-------
-.. cmake-policy:: CMP0040
+The target in the TARGET signature of add_custom_command() must exist.
CMake 2.8.12 and lower silently ignored a custom command created with
the TARGET signature of :command:`add_custom_command`
diff --git a/Help/policy/CMP0041.rst b/Help/policy/CMP0041.rst
index 975626d..5a47de0 100644
--- a/Help/policy/CMP0041.rst
+++ b/Help/policy/CMP0041.rst
@@ -1,7 +1,7 @@
CMP0041
-------
-.. cmake-policy:: CMP0041
+Error on relative include with generator expression.
Diagnostics in CMake 2.8.12 and lower silently ignored an entry in the
:prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` of a target if it contained a generator
diff --git a/Help/policy/CMP0042.rst b/Help/policy/CMP0042.rst
index c385e57..fce870c 100644
--- a/Help/policy/CMP0042.rst
+++ b/Help/policy/CMP0042.rst
@@ -1,7 +1,7 @@
CMP0042
-------
-.. cmake-policy:: CMP0042
+:prop_tgt:`MACOSX_RPATH` is enabled by default.
CMake 2.8.12 and newer has support for using ``@rpath`` in a target's install
name. This was enabled by setting the target property
diff --git a/Help/policy/CMP0043.rst b/Help/policy/CMP0043.rst
index 93fd911..629e502 100644
--- a/Help/policy/CMP0043.rst
+++ b/Help/policy/CMP0043.rst
@@ -1,7 +1,7 @@
CMP0043
-------
-.. cmake-policy:: CMP0043
+Ignore COMPILE_DEFINITIONS_<Config> properties
CMake 2.8.12 and lower allowed setting the
:prop_tgt:`COMPILE_DEFINITIONS_<CONFIG>` target property and
diff --git a/Help/policy/CMP0044.rst b/Help/policy/CMP0044.rst
index a980c90..4a3e215 100644
--- a/Help/policy/CMP0044.rst
+++ b/Help/policy/CMP0044.rst
@@ -1,7 +1,7 @@
CMP0044
-------
-.. cmake-policy:: CMP0044
+Case sensitive ``<LANG>_COMPILER_ID`` generator expressions
CMake 2.8.12 introduced the ``<LANG>_COMPILER_ID``
:manual:`generator expressions <cmake-generator-expressions(7)>` to allow
diff --git a/Help/policy/CMP0045.rst b/Help/policy/CMP0045.rst
index a7eac7b..58c422f 100644
--- a/Help/policy/CMP0045.rst
+++ b/Help/policy/CMP0045.rst
@@ -1,7 +1,7 @@
CMP0045
-------
-.. cmake-policy:: CMP0045
+Error on non-existent target in get_target_property.
In CMake 2.8.12 and lower, the :command:`get_target_property` command accepted
a non-existent target argument without issuing any error or warning. The
diff --git a/Help/policy/CMP0046.rst b/Help/policy/CMP0046.rst
index e03b632..1a3bc65 100644
--- a/Help/policy/CMP0046.rst
+++ b/Help/policy/CMP0046.rst
@@ -1,7 +1,7 @@
CMP0046
-------
-.. cmake-policy:: CMP0046
+Error on non-existent dependency in add_dependencies.
CMake 2.8.12 and lower silently ignored non-existent dependencies
listed in the :command:`add_dependencies` command.
diff --git a/Help/policy/CMP0047.rst b/Help/policy/CMP0047.rst
index 86e6a89..26ae439 100644
--- a/Help/policy/CMP0047.rst
+++ b/Help/policy/CMP0047.rst
@@ -1,7 +1,7 @@
CMP0047
-------
-.. cmake-policy:: CMP0047
+Use ``QCC`` compiler id for the qcc drivers on QNX.
CMake 3.0 and above recognize that the QNX qcc compiler driver is
different from the GNU compiler.
diff --git a/Help/policy/CMP0048.rst b/Help/policy/CMP0048.rst
index 25e23bd..a54205e 100644
--- a/Help/policy/CMP0048.rst
+++ b/Help/policy/CMP0048.rst
@@ -1,7 +1,7 @@
CMP0048
-------
-.. cmake-policy:: CMP0048
+The :command:`project` command manages VERSION variables.
CMake version 3.0 introduced the ``VERSION`` option of the :command:`project`
command to specify a project version as well as the name. In order to keep
diff --git a/Help/policy/CMP0049.rst b/Help/policy/CMP0049.rst
index b95d811..5c8d4a8 100644
--- a/Help/policy/CMP0049.rst
+++ b/Help/policy/CMP0049.rst
@@ -1,7 +1,7 @@
CMP0049
-------
-.. cmake-policy:: CMP0049
+Do not expand variables in target source entries.
CMake 2.8.12 and lower performed and extra layer of variable expansion
when evaluating source file names:
diff --git a/Help/policy/CMP0050.rst b/Help/policy/CMP0050.rst
index e4c6735..76ae0aa 100644
--- a/Help/policy/CMP0050.rst
+++ b/Help/policy/CMP0050.rst
@@ -1,7 +1,7 @@
CMP0050
-------
-.. cmake-policy:: CMP0050
+Disallow add_custom_command SOURCE signatures.
CMake 2.8.12 and lower allowed a signature for :command:`add_custom_command`
which specified an input to a command. This was undocumented behavior.
diff --git a/Help/policy/CMP0051.rst b/Help/policy/CMP0051.rst
index 19e1b37..1b56cb0 100644
--- a/Help/policy/CMP0051.rst
+++ b/Help/policy/CMP0051.rst
@@ -1,7 +1,7 @@
CMP0051
-------
-.. cmake-policy:: CMP0051
+List TARGET_OBJECTS in SOURCES target property.
CMake 3.0 and lower did not include the ``TARGET_OBJECTS``
:manual:`generator expression <cmake-generator-expressions(7)>` when
diff --git a/Help/policy/CMP0052.rst b/Help/policy/CMP0052.rst
index 5a86f8a..48cfc9c 100644
--- a/Help/policy/CMP0052.rst
+++ b/Help/policy/CMP0052.rst
@@ -1,7 +1,7 @@
CMP0052
-------
-.. cmake-policy:: CMP0052
+Reject source and build dirs in installed INTERFACE_INCLUDE_DIRECTORIES.
CMake 3.0 and lower allowed subdirectories of the source directory or build
directory to be in the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` of
diff --git a/Help/policy/CMP0053.rst b/Help/policy/CMP0053.rst
index 5d1bb34..bb0ff8b 100644
--- a/Help/policy/CMP0053.rst
+++ b/Help/policy/CMP0053.rst
@@ -1,7 +1,7 @@
CMP0053
-------
-.. cmake-policy:: CMP0053
+Simplify variable reference and escape sequence evaluation.
CMake 3.1 introduced a much faster implementation of evaluation of the
:ref:`Variable References` and :ref:`Escape Sequences` documented in the
diff --git a/Help/policy/CMP0054.rst b/Help/policy/CMP0054.rst
index 6e72b1c..3754fda 100644
--- a/Help/policy/CMP0054.rst
+++ b/Help/policy/CMP0054.rst
@@ -1,7 +1,7 @@
CMP0054
-------
-.. cmake-policy:: CMP0054
+Only interpret :command:`if` arguments as variables or keywords when unquoted.
CMake 3.1 and above no longer implicitly dereference variables or
interpret keywords in an :command:`if` command argument when
diff --git a/Help/policy/CMP0055.rst b/Help/policy/CMP0055.rst
index a64f85b..fe7ab6f 100644
--- a/Help/policy/CMP0055.rst
+++ b/Help/policy/CMP0055.rst
@@ -1,7 +1,7 @@
CMP0055
-------
-.. cmake-policy:: CMP0055
+Strict checking for the :command:`break` command.
CMake 3.1 and lower allowed calls to the :command:`break` command
outside of a loop context and also ignored any given arguments.
diff --git a/Help/policy/CMP0056.rst b/Help/policy/CMP0056.rst
index 3fa0889..3c75ff4 100644
--- a/Help/policy/CMP0056.rst
+++ b/Help/policy/CMP0056.rst
@@ -1,7 +1,7 @@
CMP0056
-------
-.. cmake-policy:: CMP0056
+Honor link flags in :command:`try_compile` source-file signature.
The :command:`try_compile` command source-file signature generates a
``CMakeLists.txt`` file to build the source file into an executable.
diff --git a/Help/policy/CMP0057.rst b/Help/policy/CMP0057.rst
index ef18ac4..1298a16 100644
--- a/Help/policy/CMP0057.rst
+++ b/Help/policy/CMP0057.rst
@@ -1,7 +1,7 @@
CMP0057
-------
-.. cmake-policy:: CMP0057
+Support new :command:`if` IN_LIST operator.
CMake 3.3 adds support for the new IN_LIST operator.
diff --git a/Help/policy/CMP0058.rst b/Help/policy/CMP0058.rst
index 1d0c0a9..0f20383 100644
--- a/Help/policy/CMP0058.rst
+++ b/Help/policy/CMP0058.rst
@@ -1,7 +1,7 @@
CMP0058
-------
-.. cmake-policy:: CMP0058
+Ninja requires custom command byproducts to be explicit.
When an intermediate file generated during the build is consumed
by an expensive operation or a large tree of dependents, one may
diff --git a/Help/policy/CMP0059.rst b/Help/policy/CMP0059.rst
index cc717a5..e40f450 100644
--- a/Help/policy/CMP0059.rst
+++ b/Help/policy/CMP0059.rst
@@ -1,7 +1,7 @@
CMP0059
-------
-.. cmake-policy:: CMP0059
+Don't treat ``DEFINITIONS`` as a built-in directory property.
CMake 3.3 and above no longer make a list of definitions available through
the :prop_dir:`DEFINITIONS` directory property. The
diff --git a/Help/policy/CMP0060.rst b/Help/policy/CMP0060.rst
index b249f84..cc37b1b 100644
--- a/Help/policy/CMP0060.rst
+++ b/Help/policy/CMP0060.rst
@@ -1,7 +1,7 @@
CMP0060
-------
-.. cmake-policy:: CMP0060
+Link libraries by full path even in implicit directories.
Policy :policy:`CMP0003` was introduced with the intention of always
linking library files by full path when a full path is given to the
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index 599c174..f8d61db 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -45,18 +45,14 @@ static bool stringToId(const char* input, cmPolicies::PolicyID& pid)
return true;
}
-#define CM_SELECT_ID_VERSION(F, A1, A2, A3, A4, A5, A6, A7) F(A1, A4, A5, A6)
+#define CM_SELECT_ID_VERSION(F, A1, A2, A3, A4, A5, A6) F(A1, A3, A4, A5)
#define CM_FOR_EACH_POLICY_ID_VERSION(POLICY) \
CM_FOR_EACH_POLICY_TABLE(POLICY, CM_SELECT_ID_VERSION)
-#define CM_SELECT_ID_DOC(F, A1, A2, A3, A4, A5, A6, A7) F(A1, A2)
+#define CM_SELECT_ID_DOC(F, A1, A2, A3, A4, A5, A6) F(A1, A2)
#define CM_FOR_EACH_POLICY_ID_DOC(POLICY) \
CM_FOR_EACH_POLICY_TABLE(POLICY, CM_SELECT_ID_DOC)
-#define CM_SELECT_ID_RST(F, A1, A2, A3, A4, A5, A6, A7) F(A1, A3)
-#define CM_FOR_EACH_POLICY_ID_RST(POLICY) \
- CM_FOR_EACH_POLICY_TABLE(POLICY, CM_SELECT_ID_RST)
-
static const char* idToString(cmPolicies::PolicyID id)
{
switch(id)
@@ -347,21 +343,6 @@ cmPolicies::GetRequiredAlwaysPolicyError(cmPolicies::PolicyID id)
return e.str();
}
-std::string cmPolicies::GetPolicyDocTitle(cmPolicies::PolicyID id)
-{
- switch(id)
- {
-#define POLICY_CASE(ID, DOC_TITLE) \
- case cmPolicies::ID: \
- return DOC_TITLE;
- CM_FOR_EACH_POLICY_ID_RST(POLICY_CASE)
-#undef POLICY_CASE
- case cmPolicies::CMPCOUNT:
- return 0;
- }
- return 0;
-}
-
cmPolicies::PolicyMap::PolicyMap()
{
this->UNDEFINED.set();
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 04d5f10..63376dd 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -21,261 +21,196 @@ class cmPolicy;
#define CM_FOR_EACH_POLICY_TABLE(POLICY, SELECT) \
SELECT(POLICY, CMP0000, \
- "A minimum required CMake version must be specified.", 0, \
+ "A minimum required CMake version must be specified.", \
2, 6, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0001, \
"CMAKE_BACKWARDS_COMPATIBILITY should no longer be used.", \
- ":variable:`CMAKE_BACKWARDS_COMPATIBILITY` should no longer be used.", \
2, 6, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0002, \
- "Logical target names must be globally unique.", 0, \
+ "Logical target names must be globally unique.", \
2, 6, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0003, \
"Libraries linked via full path no longer produce linker search paths.", \
- 0, \
2, 6, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0004, \
- "Libraries linked may not have leading or trailing whitespace.", 0, \
+ "Libraries linked may not have leading or trailing whitespace.", \
2, 6, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0005, \
- "Preprocessor definition values are now escaped automatically.", 0, \
+ "Preprocessor definition values are now escaped automatically.", \
2, 6, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0006, \
"Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION.", \
- "Installing :prop_tgt:`MACOSX_BUNDLE` targets requires a " \
- ":command:`BUNDLE DESTINATION <install()>`.", \
2, 6, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0007, \
"list command no longer ignores empty elements.", \
- ":command:`list()` command no longer ignores empty elements.", \
2, 6, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0008, \
- "Libraries linked by full-path must have a valid library file name.", 0, \
+ "Libraries linked by full-path must have a valid library file name.", \
2, 6, 1, cmPolicies::WARN) \
SELECT(POLICY, CMP0009, \
"FILE GLOB_RECURSE calls should not follow symlinks by default.", \
- ":command:`file(GLOB_RECURSE)` calls should not follow symlinks by " \
- "default.", \
2, 6, 2, cmPolicies::WARN) \
SELECT(POLICY, CMP0010, \
- "Bad variable reference syntax is an error.", 0, \
+ "Bad variable reference syntax is an error.", \
2, 6, 3, cmPolicies::WARN) \
SELECT(POLICY, CMP0011, \
"Included scripts do automatic cmake_policy PUSH and POP.", \
- ":command:`Included <include()>` scripts do automatic " \
- ":command:`cmake_policy` ``PUSH`` and ``POP``.", \
2, 6, 3, cmPolicies::WARN) \
SELECT(POLICY, CMP0012, \
"if() recognizes numbers and boolean constants.", \
- ":command:`if()` recognizes numbers and boolean constants.", \
2, 8, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0013, \
- "Duplicate binary directories are not allowed.", 0, \
+ "Duplicate binary directories are not allowed.", \
2, 8, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0014, \
- "Input directories must have CMakeLists.txt.", 0, \
+ "Input directories must have CMakeLists.txt.", \
2, 8, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0015, \
"link_directories() treats paths relative to the source dir.", \
- ":command:`link_directories()` treats paths relative to the " \
- ":variable:`CMAKE_CURRENT_SOURCE_DIR`.", \
2, 8, 1, cmPolicies::WARN) \
SELECT(POLICY, CMP0016, \
"target_link_libraries() reports error if its only argument " \
"is not a target.", \
- ":command:`target_link_libraries()` reports error if its only argument " \
- "is not a target.", \
2, 8, 3, cmPolicies::WARN) \
SELECT(POLICY, CMP0017, \
"Prefer files from the CMake module directory when including from " \
- "there.", 0, \
+ "there.", \
2, 8, 4, cmPolicies::WARN) \
SELECT(POLICY, CMP0018, \
- "Ignore CMAKE_SHARED_LIBRARY_<Lang>_FLAGS variable.", 0, \
+ "Ignore CMAKE_SHARED_LIBRARY_<Lang>_FLAGS variable.", \
2, 8, 9, cmPolicies::WARN) \
SELECT(POLICY, CMP0019, \
- "Do not re-expand variables in include and link information.", 0, \
+ "Do not re-expand variables in include and link information.", \
2, 8, 11, cmPolicies::WARN) \
SELECT(POLICY, CMP0020, \
"Automatically link Qt executables to qtmain target on Windows.", \
- "Automatically link :manual:`Qt executables <cmake-qt(7)>` to qtmain " \
- "target on Windows.", \
2, 8, 11, cmPolicies::WARN) \
SELECT(POLICY, CMP0021, \
"Fatal error on relative paths in INCLUDE_DIRECTORIES target property.", \
- "Fatal error on relative paths in :prop_tgt:`INCLUDE_DIRECTORIES` " \
- "target property.", \
2, 8, 12, cmPolicies::WARN) \
SELECT(POLICY, CMP0022, \
"INTERFACE_LINK_LIBRARIES defines the link interface.", \
- ":prop_tgt:`INTERFACE_LINK_LIBRARIES` defines the link interface.", \
2, 8, 12, cmPolicies::WARN) \
SELECT(POLICY, CMP0023, \
"Plain and keyword target_link_libraries signatures cannot be mixed.", \
- "Plain and keyword :command:`target_link_libraries()` signatures cannot " \
- "be mixed.", \
2, 8, 12, cmPolicies::WARN) \
SELECT(POLICY, CMP0024, \
- "Disallow include() of export() result.", \
- "Disallow :command:`include()` of :command:`export()` result.", \
+ "Disallow include export result.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0025, \
"Compiler id for Apple Clang is now AppleClang.", \
- ":variable:`Compiler id <CMAKE_<LANG>_COMPILER_ID>` for Apple Clang is " \
- "now ``AppleClang``.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0026, \
"Disallow use of the LOCATION target property.", \
- "Disallow use of the :prop_tgt:`LOCATION` target property.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0027, \
- "Conditionally linked IMPORTED targets with missing include " \
- "directories.", \
- "Conditionally linked :prop_tgt:`IMPORTED` targets with missing include " \
+ "Conditionally linked imported targets with missing include " \
"directories.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0028, \
"Double colon in target name means ALIAS or IMPORTED target.", \
- "Double colon in target name means :ref:`ALIAS <Alias Targets>` or " \
- ":ref:`IMPORTED <Imported targets>` target.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0029, \
"The subdir_depends command should not be called.", \
- "The :command:`subdir_depends()` command should not be called.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0030, \
"The use_mangled_mesa command should not be called.", \
- "The :command:`use_mangled_mesa()` command should not be called.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0031, \
"The load_command command should not be called.", \
- "The :command:`load_command()` command should not be called.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0032, \
"The output_required_files command should not be called.", \
- "The :command:`output_required_files()` command should not be called.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0033, \
"The export_library_dependencies command should not be called.", \
- "The :command:`export_library_dependencies()` command should not be " \
- "called.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0034, \
"The utility_source command should not be called.", \
- "The :command:`utility_source()` command should not be called.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0035, \
"The variable_requires command should not be called.", \
- "The :command:`variable_requires()` command should not be called.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0036, \
"The build_name command should not be called.", \
- "The :command:`build_name()` command should not be called.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0037, \
"Target names should not be reserved and should match a validity " \
"pattern.", \
- "Target :prop_tgt:`names <NAME>` should not be reserved and should " \
- "match a validity pattern.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0038, \
- "Targets may not link directly to themselves.", 0, \
+ "Targets may not link directly to themselves.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0039, \
- "Utility targets may not have link dependencies.", 0, \
+ "Utility targets may not have link dependencies.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0040, \
"The target in the TARGET signature of add_custom_command() must " \
"exist.", \
- "The target in the ``TARGET`` signature of " \
- ":command:`add_custom_command()` must exist.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0041, \
"Error on relative include with generator expression.", \
- "Error on relative include with " \
- ":manual:`generator expression <cmake-generator-expressions(7)>`.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0042, \
"MACOSX_RPATH is enabled by default.", \
- ":prop_tgt:`MACOSX_RPATH` is enabled by default.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0043, \
"Ignore COMPILE_DEFINITIONS_<Config> properties.", \
- "Ignore ``COMPILE_DEFINITIONS_<Config>`` properties.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0044, \
"Case sensitive <LANG>_COMPILER_ID generator expressions.", \
- "Case sensitive ``<LANG>_COMPILER_ID`` " \
- ":manual:`generator expression <cmake-generator-expressions(7)>`", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0045, \
"Error on non-existent target in get_target_property.", \
- "Error on non-existent target in :command:`get_target_property()`.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0046, \
"Error on non-existent dependency in add_dependencies.", \
- "Error on non-existent dependency in :command:`add_dependencies()`.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0047, \
"Use QCC compiler id for the qcc drivers on QNX.", \
- "Use ``QCC`` :variable:`compiler id <CMAKE_<LANG>_COMPILER_ID>` for " \
- "the qcc drivers on QNX.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0048, \
"project() command manages VERSION variables.", \
- ":command:`project()` command manages ``VERSION`` variables.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0049, \
- "Do not expand variables in target source entries.", 0, \
+ "Do not expand variables in target source entries.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0050, \
"Disallow add_custom_command SOURCE signatures.", \
- "Disallow :command:`add_custom_command(SOURCE)` signatures.", \
3, 0, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0051, \
"List TARGET_OBJECTS in SOURCES target property.", \
- "List :manual:`TARGET_OBJECTS <cmake-generator-expressions(7)>` " \
- "in :prop_tgt:`SOURCES` target property.", \
3, 1, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0052, \
"Reject source and build dirs in installed " \
"INTERFACE_INCLUDE_DIRECTORIES.", \
- "Reject source and build dirs in installed " \
- ":prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES`.", \
3, 1, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0053, \
- "Simplify variable reference and escape sequence evaluation.", 0, \
+ "Simplify variable reference and escape sequence evaluation.", \
3, 1, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0054, \
"Only interpret if() arguments as variables or keywords when unquoted.", \
- "Only interpret :command:`if()` arguments as variables or keywords " \
- "when unquoted.", \
3, 1, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0055, \
"Strict checking for break() command.", \
- "Strict checking for :command:`break()` command.", \
3, 2, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0056, \
"Honor link flags in try_compile() source-file signature.", \
- "Honor link flags in :command:`try_compile()` source-file signature.", \
3, 2, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0057, \
"Support new IN_LIST if() operator.", \
- "Support new ``IN_LIST`` :command:`if()` operator.", \
3, 3, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0058, \
- "Ninja requires custom command byproducts to be explicit.", 0, \
+ "Ninja requires custom command byproducts to be explicit.", \
3, 3, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0059, \
- "Do not treat DEFINITIONS as a built-in directory property.", \
- "Do not treat :prop_dir:`DEFINITIONS` as a built-in directory " \
- "property.", \
+ "Do no treat DEFINITIONS as a built-in directory property.", \
3, 3, 0, cmPolicies::WARN) \
SELECT(POLICY, CMP0060, \
- "Link libraries by full path even in implicit directories.", 0, \
+ "Link libraries by full path even in implicit directories.", \
3, 3, 0, cmPolicies::WARN)
-#define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6, A7) F(A1)
+#define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1)
#define CM_FOR_EACH_POLICY_ID(POLICY) \
CM_FOR_EACH_POLICY_TABLE(POLICY, CM_SELECT_ID)
@@ -334,8 +269,6 @@ public:
///! return an error string for when a required policy is unspecified
static std::string GetRequiredAlwaysPolicyError(cmPolicies::PolicyID id);
- static std::string GetPolicyDocTitle(cmPolicies::PolicyID id);
-
/** Represent a set of policy values. */
struct PolicyMap
{
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index ff54621..cb61ed9 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -14,7 +14,6 @@
#include "cmSystemTools.h"
#include "cmAlgorithms.h"
#include "cmVersion.h"
-#include "cmPolicies.h"
#include <cmsys/FStream.hxx>
#include <ctype.h>
@@ -31,7 +30,6 @@ cmRST::cmRST(std::ostream& os, std::string const& docroot):
"command|variable"
")::[ \t]+([^ \t\n]+)$"),
CMakeModuleDirective("^.. cmake-module::[ \t]+([^ \t\n]+)$"),
- CMakePolicyDirective("^.. cmake-policy::[ \t]+(.+)$"),
ParsedLiteralDirective("^.. parsed-literal::[ \t]*(.*)$"),
CodeBlockDirective("^.. code-block::[ \t]*(.*)$"),
ReplaceDirective("^.. (\\|[^|]+\\|) replace::[ \t]*(.*)$"),
@@ -197,27 +195,6 @@ void cmRST::ProcessLine(std::string const& line)
this->NormalLine(line);
}
}
- else if(this->CMakePolicyDirective.find(line))
- {
- std::string policy = this->CMakePolicyDirective.match(1);
- if(policy.empty())
- {
- this->NormalLine(line);
- }
- else
- {
- cmPolicies::PolicyID id;
- bool b = cmPolicies::GetPolicyID(policy.c_str(), id);
- if (!b)
- {
- this->NormalLine(line);
- }
- else
- {
- this->OutputLine(cmPolicies::GetPolicyDocTitle(id) + "\n", true);
- }
- }
- }
else if(this->ParsedLiteralDirective.find(line))
{
// Record the literal lines to output after whole block.
diff --git a/Source/cmRST.h b/Source/cmRST.h
index 52c9f2e..b9b2366 100644
--- a/Source/cmRST.h
+++ b/Source/cmRST.h
@@ -79,7 +79,6 @@ private:
DirectiveType Directive;
cmsys::RegularExpression CMakeDirective;
cmsys::RegularExpression CMakeModuleDirective;
- cmsys::RegularExpression CMakePolicyDirective;
cmsys::RegularExpression ParsedLiteralDirective;
cmsys::RegularExpression CodeBlockDirective;
cmsys::RegularExpression ReplaceDirective;
diff --git a/Tests/RunCMake/CMP0027/CMP0027-WARN-stderr.txt b/Tests/RunCMake/CMP0027/CMP0027-WARN-stderr.txt
index 984d9c1..9bcec3c 100644
--- a/Tests/RunCMake/CMP0027/CMP0027-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0027/CMP0027-WARN-stderr.txt
@@ -1,5 +1,5 @@
CMake Warning \(dev\) in CMakeLists.txt:
- Policy CMP0027 is not set: Conditionally linked IMPORTED targets with
+ Policy CMP0027 is not set: Conditionally linked imported targets with
missing include directories. Run "cmake --help-policy CMP0027" for policy
details. Use the cmake_policy command to set the policy and suppress this
warning.
diff --git a/Tests/RunCMake/CMP0059/CMP0059-WARN-stderr.txt b/Tests/RunCMake/CMP0059/CMP0059-WARN-stderr.txt
index 06c7be3..4e04d15 100644
--- a/Tests/RunCMake/CMP0059/CMP0059-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0059/CMP0059-WARN-stderr.txt
@@ -1,5 +1,5 @@
CMake Warning \(dev\) at CMP0059-WARN.cmake:6 \(get_property\):
- Policy CMP0059 is not set: Do not treat DEFINITIONS as a built-in directory
+ Policy CMP0059 is not set: Do no treat DEFINITIONS as a built-in directory
property. Run "cmake --help-policy CMP0059" for policy details. Use the
cmake_policy command to set the policy and suppress this warning.
Call Stack \(most recent call first\):
@@ -8,7 +8,7 @@ This warning is for project developers. Use -Wno-dev to suppress it.
DEFS: -DSOME_DEF
CMake Warning \(dev\) at CMP0059-WARN.cmake:14 \(get_property\):
- Policy CMP0059 is not set: Do not treat DEFINITIONS as a built-in directory
+ Policy CMP0059 is not set: Do no treat DEFINITIONS as a built-in directory
property. Run "cmake --help-policy CMP0059" for policy details. Use the
cmake_policy command to set the policy and suppress this warning.
Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/include/CMP0024-WARN-stderr.txt b/Tests/RunCMake/include/CMP0024-WARN-stderr.txt
index ae57674..9c79007 100644
--- a/Tests/RunCMake/include/CMP0024-WARN-stderr.txt
+++ b/Tests/RunCMake/include/CMP0024-WARN-stderr.txt
@@ -1,7 +1,7 @@
CMake Warning \(dev\) at subdir2/CMakeLists.txt:2 \(include\):
- Policy CMP0024 is not set: Disallow include\(\) of export\(\) result. Run
- "cmake --help-policy CMP0024" for policy details. Use the cmake_policy
- command to set the policy and suppress this warning.
+ Policy CMP0024 is not set: Disallow include export result. Run "cmake
+ --help-policy CMP0024" for policy details. Use the cmake_policy command to
+ set the policy and suppress this warning.
The file
diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt
index 036b8e7..a755ca1 100644
--- a/Utilities/Sphinx/CMakeLists.txt
+++ b/Utilities/Sphinx/CMakeLists.txt
@@ -71,21 +71,8 @@ endif()
if(SPHINX_TEXT)
list(APPEND doc_formats text)
endif()
-
-if (doc_formats)
- find_package(PythonInterp REQUIRED)
-
- add_custom_command(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/PolicyList.json"
- DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/create-policy-list.py"
- COMMAND "${PYTHON_EXECUTABLE}"
- "${CMAKE_CURRENT_SOURCE_DIR}/create-policy-list.py"
- "${CMAKE_CURRENT_BINARY_DIR}"
- "${CMake_SOURCE_DIR}/Source/cmPolicies.h"
- )
-endif()
-
if(SPHINX_QTHELP)
+ find_package(PythonInterp REQUIRED)
find_program(QCOLLECTIONGENERATOR_EXECUTABLE
NAMES qcollectiongenerator
@@ -135,7 +122,7 @@ foreach(format ${doc_formats})
${CMAKE_CURRENT_BINARY_DIR}/${format}
> ${doc_format_log} # log stdout, pass stderr
${${format}_extra_commands}
- DEPENDS ${doc_format_last} "${CMAKE_CURRENT_BINARY_DIR}/PolicyList.json"
+ DEPENDS ${doc_format_last}
COMMENT "sphinx-build ${format}: see Utilities/Sphinx/${doc_format_log}"
VERBATIM
)
diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py
index 26094b2..5c0406d 100644
--- a/Utilities/Sphinx/cmake.py
+++ b/Utilities/Sphinx/cmake.py
@@ -11,8 +11,6 @@
#=============================================================================
import os
import re
-import json
-from docutils import statemachine
# Monkey patch for pygments reporting an error when generator expressions are
# used.
@@ -128,43 +126,6 @@ class CMakeModule(Directive):
self.state_machine.insert_input(lines, path)
return []
-class CMakePolicyList(Directive):
- def run(self):
-
- env = self.state.document.settings.env
- with open("PolicyList.json", "r") as f:
- policies = json.load(f)
-
- policiesTocList = """
-.. toctree::
- :maxdepth: 1
-
-"""
- for policy in policies:
- policiesTocList += " " + policy["id"] + \
- " (since " + policy["version"] + ") - " + \
- policy["doc"].replace("<", "").replace(">", "") + \
- "</policy/" + policy["id"] + ">\n"
-
- include_lines = statemachine.string2lines(policiesTocList)
- self.state_machine.insert_input(include_lines, "")
- return []
-
-class CMakePolicy(Directive):
- required_arguments = 1
- def run(self):
-
- env = self.state.document.settings.env
- with open("PolicyList.json", "r") as f:
- policies = json.load(f)
-
- for policy in policies:
- if policy["id"] == self.arguments[0]:
- include_lines = statemachine.string2lines(policy["rst"])
- self.state_machine.insert_input(include_lines, "")
- break
- return []
-
class _cmake_index_entry:
def __init__(self, desc):
self.desc = desc
@@ -426,8 +387,6 @@ class CMakeDomain(Domain):
def setup(app):
app.add_directive('cmake-module', CMakeModule)
- app.add_directive('cmake-policy', CMakePolicy)
- app.add_directive('cmake-policy-list', CMakePolicyList)
app.add_transform(CMakeTransform)
app.add_transform(CMakeXRefTransform)
app.add_domain(CMakeDomain)
diff --git a/Utilities/Sphinx/create-policy-list.py b/Utilities/Sphinx/create-policy-list.py
deleted file mode 100755
index 6b0f10e..0000000
--- a/Utilities/Sphinx/create-policy-list.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env python
-
-import os, sys, json
-
-def collectString(s):
- s = s.strip()
-
- result = ""
- idx = s.find('"')
- nullptr = s.find('0')
- if (nullptr < idx):
- return (None, None)
-
- oldIdx = idx + 1
- i = 0
- while idx != -1:
- i = i + 1
- if (i > 10):
- break
- idx = s.find('"', oldIdx)
- result += s[oldIdx:idx]
- oldIdx = idx + 1
- nextQuote = s.find('"', oldIdx)
- nextComma = s.find(',', oldIdx)
- if nextQuote == -1 or (nextComma < nextQuote):
- break
- oldIdx = nextQuote + 1
- idx = oldIdx
- return result, oldIdx + 2
-
-def cleanString(s):
- return s.replace("\\", "").strip()
-
-with open(sys.argv[2]) as policyHeader:
- content = policyHeader.read()
-
- start = content.find("CM_FOR_EACH_POLICY_TABLE") + 18
- content = content[start:]
- start = content.find("SELECT(POLICY, ")
-
- policies = []
-
- while start != -1:
- content = content[start + 15:]
- policyId, content = content.split(",", 1)
- docString, docLength = collectString(content)
- content = content[docLength:]
- rstString, rstLength = collectString(content)
- if (rstString is None):
- rstString = docString
- else:
- content = content[rstLength:]
- versionMajor, versionMinor, versionPatch, content = content.split(",", 3)
- versionMajor = cleanString(versionMajor)
- versionMinor = cleanString(versionMinor)
- versionPatch = cleanString(versionPatch)
- version = versionMajor + "." + versionMinor + "." + versionPatch
-
- policies.append({"id": policyId, "doc": docString,
- "rst": rstString, "version": version})
-
- start = content.find("SELECT(POLICY, ")
-
- with open(os.path.join(sys.argv[1], "PolicyList.json"), "w") as policiesList:
-
- policiesList.write(json.dumps(policies))
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-policies.7.rst | 65 +++++++++++++-
Help/policy/CMP0000.rst | 2 +-
Help/policy/CMP0001.rst | 2 +-
Help/policy/CMP0002.rst | 2 +-
Help/policy/CMP0003.rst | 2 +-
Help/policy/CMP0004.rst | 2 +-
Help/policy/CMP0005.rst | 2 +-
Help/policy/CMP0006.rst | 2 +-
Help/policy/CMP0007.rst | 2 +-
Help/policy/CMP0008.rst | 2 +-
Help/policy/CMP0009.rst | 2 +-
Help/policy/CMP0010.rst | 2 +-
Help/policy/CMP0011.rst | 2 +-
Help/policy/CMP0012.rst | 2 +-
Help/policy/CMP0013.rst | 2 +-
Help/policy/CMP0014.rst | 2 +-
Help/policy/CMP0015.rst | 2 +-
Help/policy/CMP0016.rst | 2 +-
Help/policy/CMP0017.rst | 2 +-
Help/policy/CMP0018.rst | 2 +-
Help/policy/CMP0019.rst | 2 +-
Help/policy/CMP0020.rst | 2 +-
Help/policy/CMP0021.rst | 2 +-
Help/policy/CMP0022.rst | 2 +-
Help/policy/CMP0023.rst | 2 +-
Help/policy/CMP0024.rst | 2 +-
Help/policy/CMP0025.rst | 2 +-
Help/policy/CMP0026.rst | 2 +-
Help/policy/CMP0027.rst | 2 +-
Help/policy/CMP0028.rst | 2 +-
Help/policy/CMP0029.rst | 2 +-
Help/policy/CMP0030.rst | 2 +-
Help/policy/CMP0031.rst | 2 +-
Help/policy/CMP0032.rst | 2 +-
Help/policy/CMP0033.rst | 2 +-
Help/policy/CMP0034.rst | 2 +-
Help/policy/CMP0035.rst | 2 +-
Help/policy/CMP0036.rst | 2 +-
Help/policy/CMP0037.rst | 2 +-
Help/policy/CMP0038.rst | 2 +-
Help/policy/CMP0039.rst | 2 +-
Help/policy/CMP0040.rst | 2 +-
Help/policy/CMP0041.rst | 2 +-
Help/policy/CMP0042.rst | 2 +-
Help/policy/CMP0043.rst | 2 +-
Help/policy/CMP0044.rst | 2 +-
Help/policy/CMP0045.rst | 2 +-
Help/policy/CMP0046.rst | 2 +-
Help/policy/CMP0047.rst | 2 +-
Help/policy/CMP0048.rst | 2 +-
Help/policy/CMP0049.rst | 2 +-
Help/policy/CMP0050.rst | 2 +-
Help/policy/CMP0051.rst | 2 +-
Help/policy/CMP0052.rst | 2 +-
Help/policy/CMP0053.rst | 2 +-
Help/policy/CMP0054.rst | 2 +-
Help/policy/CMP0055.rst | 2 +-
Help/policy/CMP0056.rst | 2 +-
Help/policy/CMP0057.rst | 2 +-
Help/policy/CMP0058.rst | 2 +-
Help/policy/CMP0059.rst | 2 +-
Help/policy/CMP0060.rst | 2 +-
Source/cmPolicies.cxx | 23 +----
Source/cmPolicies.h | 109 +++++-------------------
Source/cmRST.cxx | 23 -----
Source/cmRST.h | 1 -
Tests/RunCMake/CMP0027/CMP0027-WARN-stderr.txt | 2 +-
Tests/RunCMake/CMP0059/CMP0059-WARN-stderr.txt | 4 +-
Tests/RunCMake/include/CMP0024-WARN-stderr.txt | 6 +-
Utilities/Sphinx/CMakeLists.txt | 17 +---
Utilities/Sphinx/cmake.py | 41 ---------
Utilities/Sphinx/create-policy-list.py | 66 --------------
72 files changed, 156 insertions(+), 323 deletions(-)
delete mode 100755 Utilities/Sphinx/create-policy-list.py
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list