[Cmake-commits] CMake branch, master, updated. v3.4.1-771-g64dd524

2016-01-07 Thread Brad King 
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  64dd52422b02398d652220514bcf18c2abbbe643 (commit)
   via  7656662148782b7751c62efd256e644c7295c883 (commit)
  from  0296089291d59568780baea30332b66ef24f1df4 (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=64dd52422b02398d652220514bcf18c2abbbe643
commit 64dd52422b02398d652220514bcf18c2abbbe643
Merge: 0296089 7656662
Author: Brad King 
AuthorDate: Thu Jan 7 13:28:21 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Jan 7 13:28:21 2016 -0500

Merge topic 'install-xdgdata-dir'

76566621 QtDialog: Add option to control XDG file install destination


---

Summary of changes:
 Source/CMakeInstallDestinations.cmake |5 +
 Source/QtDialog/CMakeLists.txt|6 +++---
 bootstrap |7 +++
 3 files changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.4.1-769-g0296089

2016-01-07 Thread Brad King 
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  0296089291d59568780baea30332b66ef24f1df4 (commit)
   via  64e26850fc2a98994424a34eada9bec90f384c7e (commit)
  from  1c646e4839418d51e1c9673929d55021f2ed9865 (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=0296089291d59568780baea30332b66ef24f1df4
commit 0296089291d59568780baea30332b66ef24f1df4
Merge: 1c646e4 64e2685
Author: Brad King 
AuthorDate: Thu Jan 7 13:28:18 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Jan 7 13:28:18 2016 -0500

Merge topic 'cray-prgev-cleanup'

64e26850 CrayPrgEnv: Cleanup binaries from implicit compile flag detection


---

Summary of changes:
 Modules/Compiler/CrayPrgEnv.cmake |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.4.1-785-g5112da5

2016-01-07 Thread Brad King 
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  5112da5c2fe9cfa35d741cd0f35d20c787797475 (commit)
   via  fae4779864d1e5a93369b1ac7de9ee7428a28043 (commit)
   via  083312a8fd39f6ff7a9abc79184e31eb233e8933 (commit)
   via  240b065faa9bc3b1a8dcf073a94028cd473a8c62 (commit)
   via  a95b47154ef0508cb30c82b79dab75526743498a (commit)
  from  070f09f91ea2ea903ad503925e4870aaf541d291 (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=5112da5c2fe9cfa35d741cd0f35d20c787797475
commit 5112da5c2fe9cfa35d741cd0f35d20c787797475
Merge: 070f09f fae4779
Author: Brad King 
AuthorDate: Thu Jan 7 13:28:31 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Jan 7 13:28:31 2016 -0500

Merge topic 'release-windows'

fae47798 Utilities/Release: Configure Windows binary to support Windows XP
083312a8 Utilities/Release: Switch to .msi builder for Windows binary
240b065f Utilities/Release: Optionally load environment on remote build 
server
a95b4715 Utilities/Release: Add optional remote launcher to ssh calls


---

Summary of changes:
 Help/release/dev/release-windows.rst  |7 +++
 Tests/CMakeLists.txt  |2 +-
 Utilities/Release/create-cmake-release.cmake  |2 +-
 ...sh2win64_release.cmake => dash3win7_release.cmake} |   17 +++--
 Utilities/Release/release_cmake.cmake |   11 +++
 Utilities/Release/release_cmake.sh.in |1 +
 6 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 Help/release/dev/release-windows.rst
 rename Utilities/Release/{dash2win64_release.cmake => dash3win7_release.cmake} 
(61%)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.1-1864-gda8f980

2016-01-07 Thread Brad King 
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  da8f980ca6488a3695bd813dec234cdb8b6d7da8 (commit)
   via  560346831628c1a887923e6bf866d91727e9c1ca (commit)
  from  633b34d968b9513fb3106642f88a63f346503dab (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=da8f980ca6488a3695bd813dec234cdb8b6d7da8
commit da8f980ca6488a3695bd813dec234cdb8b6d7da8
Merge: 633b34d 5603468
Author: Brad King 
AuthorDate: Thu Jan 7 13:44:35 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Jan 7 13:44:35 2016 -0500

Merge topic 'suppress-Wshadow-single' into next

56034683 fixup! CTestCustom: Suppress -Wshadow warning about Solaris 
'single' typedef


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=560346831628c1a887923e6bf866d91727e9c1ca
commit 560346831628c1a887923e6bf866d91727e9c1ca
Author: Brad King 
AuthorDate: Thu Jan 7 13:44:04 2016 -0500
Commit: Brad King 
CommitDate: Thu Jan 7 13:44:04 2016 -0500

fixup! CTestCustom: Suppress -Wshadow warning about Solaris 'single' typedef

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 634d22a..abef692 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -22,7 +22,7 @@ list(APPEND CTEST_CUSTOM_WARNING_EXCEPTION
   "Utilities.cmexpat."
   "Utilities.cmlibarchive"
   "warning: declaration of .single. shadows a global declaration"
-  "/usr/include.*warning.*shadowed declaration is here"
+  "/usr/include.*(warning|note).*shadowed declaration is here"
   "/usr/bin/ld.*warning.*-..*directory.name.*bin.*does not exist"
   "Redeclaration of .send. with a different storage class specifier"
   "is not used for resolving any symbol"

---

Summary of changes:
 CTestCustom.cmake.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.1-1862-g633b34d

2016-01-07 Thread Brad King 
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  633b34d968b9513fb3106642f88a63f346503dab (commit)
   via  5112da5c2fe9cfa35d741cd0f35d20c787797475 (commit)
   via  070f09f91ea2ea903ad503925e4870aaf541d291 (commit)
   via  f7fbe0f6811dcd656f8cf772c6d57199c92f0a5e (commit)
   via  5c6cbd390e1d2466df318d2f25e563eb3418bce3 (commit)
   via  64dd52422b02398d652220514bcf18c2abbbe643 (commit)
   via  0296089291d59568780baea30332b66ef24f1df4 (commit)
   via  1c646e4839418d51e1c9673929d55021f2ed9865 (commit)
  from  1a1d94b61c82bd507dc4c36ef323043be9454dd2 (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=633b34d968b9513fb3106642f88a63f346503dab
commit 633b34d968b9513fb3106642f88a63f346503dab
Merge: 1a1d94b 5112da5
Author: Brad King 
AuthorDate: Thu Jan 7 13:31:10 2016 -0500
Commit: Brad King 
CommitDate: Thu Jan 7 13:31:10 2016 -0500

Merge branch 'master' into next


---

Summary of changes:


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.4.1-1868-g9469108

2016-01-07 Thread Brad King 
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  946910862468bef655e28378fc0bf74caa70dc7a (commit)
   via  bbb3c4ffc18dcadc774b7fe4b2ceca1557ddb253 (commit)
  from  4aae44966324856ff60424e4629681c1840794f7 (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=946910862468bef655e28378fc0bf74caa70dc7a
commit 946910862468bef655e28378fc0bf74caa70dc7a
Merge: 4aae449 bbb3c4f
Author: Brad King 
AuthorDate: Thu Jan 7 16:12:29 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Jan 7 16:12:29 2016 -0500

Merge topic 'cpack-dmg-license-fixes' into next

bbb3c4ff CPack/DragNDrop: Fix handling of certain license file content 
(#15899)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbb3c4ffc18dcadc774b7fe4b2ceca1557ddb253
commit bbb3c4ffc18dcadc774b7fe4b2ceca1557ddb253
Author: Andrey Mishchenko 
AuthorDate: Sat Jan 2 16:11:00 2016 -0500
Commit: Brad King 
CommitDate: Thu Jan 7 15:24:42 2016 -0500

CPack/DragNDrop: Fix handling of certain license file content (#15899)

There were issues in the special-character-escaping and line-wrapping
code which caused DragNDrop packaging to fail mysteriously at a later
step with parsing errors in the `sla.r` file generated by the following
code.

diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx 
b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 1a694ea..7b94ca3 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -693,27 +693,49 @@ int cmCPackDragNDropGenerator::CreateDMG(const 
std::string& src_dir,
   ofs << std::dec << std::nouppercase << std::setfill(' ');
   }
 
+bool have_write_license_error = false;
+std::string error;
+
 if(oldStyle)
   {
-  WriteLicense(ofs, 0, "", cpack_license_file);
+  if(!this->WriteLicense(ofs, 0, "", cpack_license_file, ))
+{
+have_write_license_error = true;
+}
   }
 else
   {
-  for(size_t i = 0; i < languages.size(); ++i)
+  for(size_t i = 0; i < languages.size() && !have_write_license_error; ++i)
 {
 if(singleLicense)
   {
-  WriteLicense(ofs, i + 5000, languages[i], cpack_license_file);
+  if(!this->WriteLicense(ofs, i + 5000, languages[i],
+ cpack_license_file, ))
+{
+have_write_license_error = true;
+}
   }
 else
   {
-  WriteLicense(ofs, i + 5000, languages[i]);
+  if(!this->WriteLicense(ofs, i + 5000, languages[i], "", ))
+{
+have_write_license_error = true;
+}
   }
 }
   }
 
 ofs.Close();
 
+if(have_write_license_error)
+  {
+  cmCPackLogger(cmCPackLog::LOG_ERROR,
+"Error writing license file to SLA." << std::endl
+<< error
+<< std::endl);
+  return 0;
+  }
+
 // convert to UDCO
 std::string temp_udco = this->GetOption("CPACK_TOPLEVEL_DIRECTORY");
 temp_udco += "/temp-udco.dmg";
@@ -724,7 +746,6 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& 
src_dir,
 udco_image_command << " -format UDCO";
 udco_image_command << " -ov -o \"" << temp_udco << "\"";
 
-std::string error;
 if(!this->RunCommand(udco_image_command, ))
   {
   cmCPackLogger(cmCPackLog::LOG_ERROR,
@@ -855,9 +876,10 @@ 
cmCPackDragNDropGenerator::GetComponentInstallDirNameSuffix(
   return GetComponentPackageFileName(package_file_name, componentName, false);
 }
 
-void
+bool
 cmCPackDragNDropGenerator::WriteLicense(cmGeneratedFileStream& outputStream,
-  int licenseNumber, std::string licenseLanguage, std::string licenseFile)
+  int licenseNumber, std::string licenseLanguage, std::string licenseFile,
+  std::string *error)
 {
   if(!licenseFile.empty() && !singleLicense)
 {
@@ -881,9 +903,12 @@ 
cmCPackDragNDropGenerator::WriteLicense(cmGeneratedFileStream& outputStream,
   std::getline(license_ifs, line);
   if(!line.empty())
 {
-EscapeQuotes(line);
+EscapeQuotesAndBackslashes(line);
 std::vector lines;
-BreakLongLine(line, lines);
+if(!this->BreakLongLine(line, lines, error))
+  {
+  return false;
+  }
 for(size_t i = 0; i < lines.size(); ++i)
   {
   outputStream << "\"" << lines[i] << "\"\n";
@@ -920,9 +945,12 @@ 
cmCPackDragNDropGenerator::WriteLicense(cmGeneratedFileStream&