Imported Upstream version 3.11.2upstream/3.11.2

3 files changed, 26 insertions, 3 deletions

diff --git a/Help/prop_sf/COMPILE_FLAGS.rst b/Help/prop_sf/COMPILE_FLAGS.rst
index be81cf60a..c211b89ac 100644
--- a/Help/prop_sf/COMPILE_FLAGS.rst
+++ b/Help/prop_sf/COMPILE_FLAGS.rst
@@ -3,9 +3,9 @@ COMPILE_FLAGS
 
 Additional flags to be added when compiling this source file.
 
-The ``COMPILE_FLAGS`` property sets additional compiler flags used to build
-source files.  Use :prop_sf:`COMPILE_DEFINITIONS` to pass additional
-preprocessor definitions.
+The ``COMPILE_FLAGS`` property, managed as a string, sets additional compiler
+flags used to build source files.  Use :prop_sf:`COMPILE_DEFINITIONS` to pass
+additional preprocessor definitions.
 
 Contents of ``COMPILE_FLAGS`` may use "generator expressions"
 with the syntax ``$<...>``.  See the :manual:`cmake-generator-expressions(7)`
@@ -13,3 +13,7 @@ manual for available expressions.  However, :generator:`Xcode`
 does not support per-config per-source settings, so expressions
 that depend on the build configuration are not allowed with that
 generator.
+
+.. note::
+
+  This property has been superseded by the :prop_sf:`COMPILE_OPTIONS` property.
diff --git a/Help/prop_sf/COMPILE_OPTIONS.rst b/Help/prop_sf/COMPILE_OPTIONS.rst
index 157c0b0e8..3b2bc8da2 100644
--- a/Help/prop_sf/COMPILE_OPTIONS.rst
+++ b/Help/prop_sf/COMPILE_OPTIONS.rst
@@ -15,3 +15,7 @@ for available expressions.  However, :generator:`Xcode`
 does not support per-config per-source settings, so expressions
 that depend on the build configuration are not allowed with that
 generator.
+
+.. note::
+
+  This property should be preferred over the :prop_sf:`COMPILE_FLAGS` property.
diff --git a/Help/release/3.11.rst b/Help/release/3.11.rst
index dbaa8af4d..971b3e2ba 100644
--- a/Help/release/3.11.rst
+++ b/Help/release/3.11.rst
@@ -283,3 +283,18 @@ Changes made since CMake 3.11.0 include the following.
   CMake 3.11.0.  This has been reverted due to changing behavior of
   checks for existing projects.  It may be restored in the future
   with a policy for compatibility.
+
+3.11.2
+------
+
+* Calling :command:`add_library` to create an alias of an imported
+  target that is not globally visible now causes an error again as
+  it did prior to 3.11.0.  This diagnostic was accidentally dropped
+  from CMake 3.11.0 and 3.11.1 by the change to allow globally visible
+  imported targets to be aliased.
+
+* The :module:`FindQt4` module ``qt4_wrap_cpp``, ``qt4_wrap_ui`` and
+  ``qt4_add_resources`` macros now set :prop_sf:`SKIP_AUTOMOC` and
+  :prop_sf:`SKIP_AUTOUIC` on their generated files.  These files never
+  need to be processed by moc or uic, and we must say so explicitly to
+  account for policy :policy:`CMP0071`.