New upstream version 3.27.0

Help/command/export.rst

@@ -78,6 +78,10 @@ to automatically export the same targets from the build tree as
   transitive usage requirements of other targets that link to the
   object libraries in their implementation.
 
+This command exports all :ref:`build configurations` from the build tree.
+See the :variable:`CMAKE_MAP_IMPORTED_CONFIG_<CONFIG>` variable to map
+configurations of dependent projects to the exported configurations.
+
 Exporting Targets to Android.mk
 """""""""""""""""""""""""""""""
 

Help/command/install.rst

@@ -835,6 +835,8 @@ the ``FILE`` option must be a file name with the ``.cmake`` extension.
 If a ``CONFIGURATIONS`` option is given then the file will only be installed
 when one of the named configurations is installed.  Additionally, the
 generated import file will reference only the matching target
+configurations.  See the :variable:`CMAKE_MAP_IMPORTED_CONFIG_<CONFIG>`
+variable to map configurations of dependent projects to the installed
 configurations.  The ``EXPORT_LINK_INTERFACE_LIBRARIES`` keyword, if
 present, causes the contents of the properties matching
 ``(IMPORTED_)?LINK_INTERFACE_LIBRARIES(_<CONFIG>)?`` to be exported, when

Modules/Compiler/ARMClang-DetermineCompiler.cmake

@@ -4,7 +4,7 @@ set(_compiler_id_pp_test "defined(__clang__) && defined(__ARMCOMPILER_VERSION)")
 set(_compiler_id_version_compute "
   # define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__ARMCOMPILER_VERSION/1000000)
   # define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__ARMCOMPILER_VERSION/10000 % 100)
-  # define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__ARMCOMPILER_VERSION     % 10000)")
+  # define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__ARMCOMPILER_VERSION/100   % 100)")
 
 string(APPEND _compiler_id_version_compute "
 # define @PREFIX@COMPILER_VERSION_INTERNAL @MACRO_DEC@(__ARMCOMPILER_VERSION)")

Source/CMakeVersion.cmake

@@ -2,7 +2,7 @@
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 27)
 set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 5)
+#set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)
 
 # Start with the full version number used in tags.  It has no dev info.
@@ -21,7 +21,7 @@ endif()
 
 if(NOT CMake_VERSION_NO_GIT)
   # If this source was exported by 'git archive', use its commit info.
-  set(git_info [==[8bcba75b1c CMake 3.27.0-rc5]==])
+  set(git_info [==[784596bd08 CMake 3.27.0]==])
 
   # Otherwise, try to identify the current development source version.
   if(NOT git_info MATCHES "^([0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]?[0-9a-f]?)[0-9a-f]* "

Source/CPack/cmCPackInnoSetupGenerator.cxx

@@ -583,10 +583,8 @@ bool cmCPackInnoSetupGenerator::ProcessComponents()
                          "this script uses components }");
 
   // Installation types
-  bool noTypes = true;
   std::vector<cmCPackInstallationType*> types(InstallationTypes.size());
   for (auto& i : InstallationTypes) {
-    noTypes = false;
     types[i.second.Index - 1] = &i.second;
   }
 
@@ -601,17 +599,16 @@ bool cmCPackInnoSetupGenerator::ProcessComponents()
     typeInstructions.push_back(ISKeyValueLine(params));
   }
 
-  if (!noTypes) {
+  // Inno Setup requires the additional "custom" type
-    // Inno Setup requires the "custom" type
+  cmCPackInnoSetupKeyValuePairs customTypeParams;
-    cmCPackInnoSetupKeyValuePairs params;
 
-    params["Name"] = "\"custom\"";
+  customTypeParams["Name"] = "\"custom\"";
-    params["Description"] = "\"{code:CPackGetCustomInstallationMessage}\"";
+  customTypeParams["Description"] =
-    params["Flags"] = "iscustom";
+    "\"{code:CPackGetCustomInstallationMessage}\"";
+  customTypeParams["Flags"] = "iscustom";
 
   allTypes.push_back("custom");
-    typeInstructions.push_back(ISKeyValueLine(params));
+  typeInstructions.push_back(ISKeyValueLine(customTypeParams));
-  }
 
   // Components
   std::vector<cmCPackComponent*> downloadedComponents;