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, master has been updated
via 776d1e5e79ab5194a39ea53252703bf3cc13c118 (commit)
via c80dfa0d5ba8817d73de5ee0a324d114b8336e05 (commit)
via 0e46dea3430958183cb514c2a5518b5079ef588c (commit)
via 1c09b8c164e0efd8fe82bb783d014e09e0285a0e (commit)
via bd1655571738126eaf878960423a648cb34baf0b (commit)
via e2cb9bcef22278564a15c696d3141fd2b3425a81 (commit)
via 667a88e260c4fccd0da23a96e3768d4e01dadc23 (commit)
via 498e3e67b3d4bd4e813d1fa1851c1d7aa115253d (commit)
via 6cb9867ba3054ea4fbafa7ee60485db4d6266354 (commit)
via b60563fee8cfa981f997d20df37d26938bf24883 (commit)
via e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6 (commit)
via 7d6ab5dc5bac806a268eac55deaf5bc550aaa6d4 (commit)
via bb4c2781ced335c81b3c9307069792dba66d5062 (commit)
via a4c19cb895f6275c5ff1a3991a117df1ad27cf15 (commit)
via 0b9f1cc96b5babb10f14781648b02f9a28124cbc (commit)
via 9e27e52d4b0fee729f9a3bef710efed290ef9900 (commit)
via 26367b4bb2be9013d3bc30deef8ef1eda866a5cd (commit)
via cc88ede7a37f8180f670c0d6036ba40cf005c7b9 (commit)
via dae9a808fe0cb039298fab75459e3803403c5194 (commit)
from f63d84c37c9ee1ea686369848b5bfc22916e1551 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=776d1e5e79ab5194a39ea53252703bf3cc13c118
commit 776d1e5e79ab5194a39ea53252703bf3cc13c118
Merge: c80dfa0d5b a4c19cb895
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 18 14:51:59 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Nov 18 09:52:13 2019 -0500
Merge topic 'win-no-error-popup'
a4c19cb895 Windows: Restore suppression of error report popups in CI builds
0b9f1cc96b Merge branch 'upstream-KWSys' into win-no-error-popup
9e27e52d4b KWSys 2019-11-15 (329d8c7c)
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4052
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c80dfa0d5ba8817d73de5ee0a324d114b8336e05
commit c80dfa0d5ba8817d73de5ee0a324d114b8336e05
Merge: 0e46dea343 1c09b8c164
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 18 14:50:35 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Nov 18 09:50:58 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e46dea3430958183cb514c2a5518b5079ef588c
commit 0e46dea3430958183cb514c2a5518b5079ef588c
Merge: bd16555717 7d6ab5dc5b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 18 14:50:35 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Nov 18 09:50:57 2019 -0500
Merge topic 'cpack-custom-templates'
7d6ab5dc5b CPack: Restore support for custom package configuration templates
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Kyle Edwards <kyle.edwa...@kitware.com>
Merge-request: !4054
diff --cc Source/CPack/cmCPackPKGGenerator.cxx
index 328aac3826,dae5ec9d4b..ac3d64d9ae
--- a/Source/CPack/cmCPackPKGGenerator.cxx
+++ b/Source/CPack/cmCPackPKGGenerator.cxx
@@@ -46,69 -46,10 +46,69 @@@ std::string cmCPackPKGGenerator::GetPac
return component.ArchiveFile + ".pkg";
}
-void cmCPackPKGGenerator::WriteDistributionFile(const char* metapackageFile)
+void cmCPackPKGGenerator::CreateBackground(const char* themeName,
+ const char* metapackageFile,
+ cm::string_view genName,
+ cmXMLWriter& xout)
+{
+ std::string paramSuffix =
+ (themeName == nullptr) ? "" : cmSystemTools::UpperCase(themeName);
+ std::string opt = (themeName == nullptr)
+ ? cmStrCat("CPACK_", genName, "_BACKGROUND")
+ : cmStrCat("CPACK_", genName, "_BACKGROUND_", paramSuffix);
+ const char* bgFileName = this->GetOption(opt);
+ if (bgFileName == nullptr) {
+ return;
+ }
+
+ std::string bgFilePath = cmStrCat(metapackageFile, "/Contents/",
bgFileName);
+
+ if (!cmSystemTools::FileExists(bgFilePath)) {
+ cmCPackLogger(cmCPackLog::LOG_ERROR,
+ "Background image doesn't exist in the resource directory: "
+ << bgFileName << std::endl);
+ return;
+ }
+
+ if (themeName == nullptr) {
+ xout.StartElement("background");
+ } else {
+ xout.StartElement(cmStrCat("background-", themeName));
+ }
+
+ xout.Attribute("file", bgFileName);
+
+ const char* param = this->GetOption(cmStrCat(opt, "_ALIGNMENT"));
+ if (param != nullptr) {
+ xout.Attribute("alignment", param);
+ }
+
+ param = this->GetOption(cmStrCat(opt, "_SCALING"));
+ if (param != nullptr) {
+ xout.Attribute("scaling", param);
+ }
+
+ // Apple docs say that you must provide either mime-type or uti
+ // attribute for the background, but I've seen examples that
+ // doesn't have them, so don't make them mandatory.
+ param = this->GetOption(cmStrCat(opt, "_MIME_TYPE"));
+ if (param != nullptr) {
+ xout.Attribute("mime-type", param);
+ }
+
+ param = this->GetOption(cmStrCat(opt, "_UTI"));
+ if (param != nullptr) {
+ xout.Attribute("uti", param);
+ }
+
+ xout.EndElement();
+}
+
+void cmCPackPKGGenerator::WriteDistributionFile(const char* metapackageFile,
+ const char* genName)
{
std::string distributionTemplate =
- this->FindTemplate("Internal/CPack/CPack.distribution.dist.in");
+ this->FindTemplate("CPack.distribution.dist.in");
if (distributionTemplate.empty()) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
"Cannot find input file: " << distributionTemplate
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd1655571738126eaf878960423a648cb34baf0b
commit bd1655571738126eaf878960423a648cb34baf0b
Merge: e2cb9bcef2 26367b4bb2
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 18 14:50:03 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Nov 18 09:50:14 2019 -0500
Merge topic 'CPackNuget-dep-id'
26367b4bb2 CPack/NuGet: Do not mangle non-C-identifier chars in dependencies
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4044
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2cb9bcef22278564a15c696d3141fd2b3425a81
commit e2cb9bcef22278564a15c696d3141fd2b3425a81
Merge: 498e3e67b3 667a88e260
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 18 14:46:24 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Nov 18 09:47:36 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=498e3e67b3d4bd4e813d1fa1851c1d7aa115253d
commit 498e3e67b3d4bd4e813d1fa1851c1d7aa115253d
Merge: b60563fee8 cc88ede7a3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 18 14:46:24 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Nov 18 09:47:35 2019 -0500
Merge topic 'docs-pch-reorg'
cc88ede7a3 Help: Provide guidance on INTERFACE for
target_precompile_headers()
dae9a808fe Help: Reorganise target_precompile_headers() docs for readability
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4045
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b60563fee8cfa981f997d20df37d26938bf24883
commit b60563fee8cfa981f997d20df37d26938bf24883
Merge: e14c9af013 6cb9867ba3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 18 14:46:11 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Nov 18 09:46:26 2019 -0500
Merge branch 'release-3.16'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6
commit e14c9af013e8fe898a2cb46f4c1bd73dc72ff0a6
Merge: f63d84c37c bb4c2781ce
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 18 14:46:11 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Nov 18 09:46:26 2019 -0500
Merge topic 'pch-reuse-no-prop'
bb4c2781ce PCH: Do not issue an error on duplicate
target_precompile_headers call
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !4046
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4c19cb895f6275c5ff1a3991a117df1ad27cf15
commit a4c19cb895f6275c5ff1a3991a117df1ad27cf15
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 15 09:23:47 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Nov 15 09:23:47 2019 -0500
Windows: Restore suppression of error report popups in CI builds
On Windows, libuv uses `_CrtSetReportHook` to install a handler it uses
to suppress assertions on invalid file descriptors in `_get_osfhandle`.
This removes the handler we install in CI environments to suppress
interactive popups. Move installation of our handler to after libuv is
initialized so that our handler is actually used.
Unfortunately this also removes libuv's handler and so may cause Debug
builds under CI to abort on invalid file descriptors instead of simply
converting them to `INVALID_HANDLE_VALUE`. If this becomes a problem
we may need to modify libuv to make its hook more configurable.
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index d7868f3465..dc316233c9 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -115,7 +115,6 @@ int main(int argc, char const* const* argv)
argc = args.argc();
argv = args.argv();
- cmSystemTools::EnableMSVCDebugHook();
cmSystemTools::InitializeLibUV();
cmSystemTools::FindCMakeResources(argv[0]);
cmCPackLog log;
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index c4a4220f81..17d32c6997 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -814,6 +814,8 @@ void cmSystemTools::InitializeLibUV()
# else
_fmode = _O_TEXT;
# endif
+ // Replace libuv's report handler with our own to suppress popups.
+ cmSystemTools::EnableMSVCDebugHook();
#endif
}
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index baf975ecb2..d8179715e1 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -683,7 +683,6 @@ int main(int ac, char const* const* av)
ac = args.argc();
av = args.argv();
- cmSystemTools::EnableMSVCDebugHook();
cmSystemTools::InitializeLibUV();
cmSystemTools::FindCMakeResources(av[0]);
if (ac > 1) {
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index a7b11cd944..a9fcc848ab 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -164,7 +164,6 @@ int main(int argc, char const* const* argv)
argv = encoding_args.argv();
cmSystemTools::DoNotInheritStdPipes();
- cmSystemTools::EnableMSVCDebugHook();
cmSystemTools::InitializeLibUV();
cmSystemTools::FindCMakeResources(argv[0]);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b9f1cc96b5babb10f14781648b02f9a28124cbc
commit 0b9f1cc96b5babb10f14781648b02f9a28124cbc
Merge: 1d78e1a966 9e27e52d4b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Nov 15 09:20:47 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Nov 15 09:21:08 2019 -0500
Merge branch 'upstream-KWSys' into win-no-error-popup
* upstream-KWSys:
KWSys 2019-11-15 (329d8c7c)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e27e52d4b0fee729f9a3bef710efed290ef9900
commit 9e27e52d4b0fee729f9a3bef710efed290ef9900
Author: KWSys Upstream <kwro...@kitware.com>
AuthorDate: Fri Nov 15 08:05:29 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Nov 15 09:20:46 2019 -0500
KWSys 2019-11-15 (329d8c7c)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 329d8c7c907353999827c02a7af341e57aff90aa (master).
Upstream Shortlog
-----------------
Brad King (1):
2581cfd1 SystemTools: Update EnableMSVCDebugHook to simulate "Retry"
diff --git a/SystemTools.cxx b/SystemTools.cxx
index dcf05daa85..39873e630d 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4666,8 +4666,12 @@ void SystemTools::ClassFinalize()
# include <stdlib.h>
namespace KWSYS_NAMESPACE {
-static int SystemToolsDebugReport(int, char* message, int*)
+static int SystemToolsDebugReport(int, char* message, int* ret)
{
+ if (ret) {
+ // Pretend user clicked on Retry button in popup.
+ *ret = 1;
+ }
fprintf(stderr, "%s", message);
fflush(stderr);
return 1; // no further reporting required
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26367b4bb2be9013d3bc30deef8ef1eda866a5cd
commit 26367b4bb2be9013d3bc30deef8ef1eda866a5cd
Author: yacoub <yacoub.hoss...@autodesk.com>
AuthorDate: Wed Nov 13 08:27:02 2019 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Nov 14 14:48:03 2019 -0500
CPack/NuGet: Do not mangle non-C-identifier chars in dependencies
Fixes: #19956
diff --git a/Modules/Internal/CPack/CPackNuGet.cmake
b/Modules/Internal/CPack/CPackNuGet.cmake
index 82053b221d..b46a7b175d 100644
--- a/Modules/Internal/CPack/CPackNuGet.cmake
+++ b/Modules/Internal/CPack/CPackNuGet.cmake
@@ -230,13 +230,11 @@ function(_cpack_nuget_render_spec)
foreach(_dep IN LISTS _deps)
_cpack_nuget_debug(" checking dependency `${_dep}`")
- string(MAKE_C_IDENTIFIER "${_dep}" _dep_id)
-
- _cpack_nuget_variable_fallback(_ver DEPENDENCIES_${_dep_id}_VERSION)
+ _cpack_nuget_variable_fallback(_ver DEPENDENCIES_${_dep}_VERSION)
if(NOT _ver)
- string(TOUPPER "${_dep_id}" _dep_id)
- _cpack_nuget_variable_fallback(_ver
DEPENDENCIES_${_dep_id}_VERSION)
+ string(TOUPPER "${_dep}" _dep_upper)
+ _cpack_nuget_variable_fallback(_ver
DEPENDENCIES_${_dep_upper}_VERSION)
endif()
if(_ver)
-----------------------------------------------------------------------
Summary of changes:
Help/command/target_precompile_headers.rst | 122 ++++++++++++---------
Help/prop_tgt/INTERFACE_PRECOMPILE_HEADERS.rst | 2 +
Modules/Internal/CPack/CPackNuGet.cmake | 8 +-
Source/CPack/WiX/cmCPackWIXGenerator.cxx | 2 +-
Source/CPack/cmCPackGenerator.cxx | 11 ++
Source/CPack/cmCPackNSISGenerator.cxx | 5 +-
Source/CPack/cmCPackOSXX11Generator.cxx | 2 +-
Source/CPack/cmCPackPKGGenerator.cxx | 4 +-
Source/CPack/cmCPackSTGZGenerator.cxx | 3 +-
Source/CPack/cpack.cxx | 1 -
Source/cmGeneratorTarget.cxx | 9 +-
Source/cmSystemTools.cxx | 2 +
Source/cmTarget.cxx | 7 +-
Source/cmakemain.cxx | 1 -
Source/ctest.cxx | 1 -
Source/kwsys/SystemTools.cxx | 6 +-
.../RunCMake/PrecompileHeaders/PchReuseFrom.cmake | 9 +-
Tests/RunCMake/PrecompileHeaders/foobar.c | 8 +-
18 files changed, 125 insertions(+), 78 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
