[Cmake-commits] CMake branch, master, updated. v3.6.1-862-g7727915

2016-09-05 Thread Kitware Robot 
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  77279153953fb9e757481ac9eb299608f6f2aeba (commit)
  from  4f83077e2d3fffed1d86b1e14ea34343db62cc3a (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=77279153953fb9e757481ac9eb299608f6f2aeba
commit 77279153953fb9e757481ac9eb299608f6f2aeba
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Tue Sep 6 00:01:05 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Sep 6 00:01:05 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index c886a6a..fb13b21 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160905)
+set(CMake_VERSION_PATCH 20160906)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |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.6.1-1794-gd16d98e

2016-09-05 Thread Domen Vrankar 
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  d16d98e86a084508666fd9768b779ae0ce96763a (commit)
   via  87a944984abeacbc984e3197f7bcfe54faf6aaad (commit)
  from  ed5cd9993461fabf38e9986dc52b304cd5f2830b (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=d16d98e86a084508666fd9768b779ae0ce96763a
commit d16d98e86a084508666fd9768b779ae0ce96763a
Merge: ed5cd99 87a9449
Author: Domen Vrankar 
AuthorDate: Mon Sep 5 18:24:15 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 18:24:15 2016 -0400

Merge topic 'cpack-deb-package-description-fallback' into next

87a94498 fixup! cpack-deb-package-description-fallback


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87a944984abeacbc984e3197f7bcfe54faf6aaad
commit 87a944984abeacbc984e3197f7bcfe54faf6aaad
Author: Domen Vrankar 
AuthorDate: Tue Sep 6 00:23:41 2016 +0200
Commit: Domen Vrankar 
CommitDate: Tue Sep 6 00:23:41 2016 +0200

fixup! cpack-deb-package-description-fallback

Default description file path is set by CPack.cmake
script so handle the case when that script is
not used.

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index cbba186..25c25ae 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -167,7 +167,8 @@
 #   based installers only) if set,
 #- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default 
location,
 #- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default location content
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default value if set,
+#- or "no package description available"
 #
 # .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
 #   CPACK_DEBIAN__PACKAGE_SECTION
@@ -826,8 +827,10 @@ function(cpack_deb_prepare_package_vars)
   file(READ "${CPACK_PACKAGE_DESCRIPTION_FILE}" 
CPACK_DEBIAN_PACKAGE_DESCRIPTION)
 elseif(CPACK_PACKAGE_DESCRIPTION_SUMMARY)
   set(CPACK_DEBIAN_PACKAGE_DESCRIPTION 
"${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
-else() # use default package description file content
+elseif(CPACK_PACKAGE_DESCRIPTION_FILE) # use default package description 
file content
   file(READ "${CPACK_PACKAGE_DESCRIPTION_FILE}" 
CPACK_DEBIAN_PACKAGE_DESCRIPTION)
+else()
+  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "no package description available")
 endif()
   endif()
 

---

Summary of changes:
 Modules/CPackDeb.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, next, updated. v3.6.1-1792-ged5cd99

2016-09-05 Thread Domen Vrankar 
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  ed5cd9993461fabf38e9986dc52b304cd5f2830b (commit)
   via  d3c1b906906bd6abab1d42fc1166e117b7ce8567 (commit)
  from  8752d765ae63edd5153a0547727989a4efe4d809 (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=ed5cd9993461fabf38e9986dc52b304cd5f2830b
commit ed5cd9993461fabf38e9986dc52b304cd5f2830b
Merge: 8752d76 d3c1b90
Author: Domen Vrankar 
AuthorDate: Mon Sep 5 17:59:22 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 17:59:22 2016 -0400

Merge topic 'cpack-deb-package-description-fallback' into next

d3c1b906 cpack-deb-package-description-fallback


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3c1b906906bd6abab1d42fc1166e117b7ce8567
commit d3c1b906906bd6abab1d42fc1166e117b7ce8567
Author: Domen Vrankar 
AuthorDate: Mon Sep 5 23:58:33 2016 +0200
Commit: Domen Vrankar 
CommitDate: Mon Sep 5 23:58:33 2016 +0200

cpack-deb-package-description-fallback

Breaking change of fallback variable precedence
for CPACK_DEBIAN_PACKAGE_DESCRIPTION that matches
CPackRPM behavior as much as possible.
See Issue #16272

diff --git a/Help/release/dev/cpack-deb-package-description-fallback 
b/Help/release/dev/cpack-deb-package-description-fallback
new file mode 100644
index 000..6300dfc
--- /dev/null
+++ b/Help/release/dev/cpack-deb-package-description-fallback
@@ -0,0 +1,11 @@
+cpack-deb-package-description-fallback
+--
+
+* The :module:`CPackDeb` module learned new package description
+  override rules to match :module:`CPackRPM` module behavior.
+  **Breaking change**: If :variable:`CPACK_PACKAGE_DESCRIPTION_FILE`
+  variable is set to non default location then it is prefered to
+  :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` variable.
+  Also a new :variable:`CPACK_DEBIAN__PACKAGE_DESCRIPTION`
+  was introduced for component based packaging.
+  See :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION`.
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index c9678d6..cbba186 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -156,16 +156,18 @@
 #  * Default   : :code:`CPACK_PACKAGE_CONTACT`
 #
 # .. variable:: CPACK_DEBIAN_PACKAGE_DESCRIPTION
-#   CPACK_COMPONENT__DESCRIPTION
+#   CPACK_DEBIAN__PACKAGE_DESCRIPTION
 #
 #  The Debian package description
 #
 #  * Mandatory : YES
 #  * Default   :
 #
-#- :variable:`CPACK_DEBIAN_PACKAGE_DESCRIPTION` if set or
-#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY`
-#
+#- :variable:`CPACK_COMPONENT__DESCRIPTION` (component
+#   based installers only) if set,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` if set to non default 
location,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_SUMMARY` if set,
+#- :variable:`CPACK_PACKAGE_DESCRIPTION_FILE` default location content
 #
 # .. variable:: CPACK_DEBIAN_PACKAGE_SECTION
 #   CPACK_DEBIAN__PACKAGE_SECTION
@@ -811,24 +813,21 @@ function(cpack_deb_prepare_package_vars)
   endif()
 
   # Description: (mandatory)
-  if(NOT CPACK_DEB_PACKAGE_COMPONENT)
-if(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
-  if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a 
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or 
CPACK_DEBIAN_PACKAGE_DESCRIPTION")
-  endif()
-  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION 
${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
+  if(CPACK_DEB_PACKAGE_COMPONENT)
+if(CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION)
+  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION 
"${CPACK_DEBIAN_${_local_component_name}_PACKAGE_DESCRIPTION}")
+elseif(CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
+  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION 
"${CPACK_COMPONENT_${_local_component_name}_DESCRIPTION}")
 endif()
-  else()
-set(component_description_var 
CPACK_COMPONENT_${_local_component_name}_DESCRIPTION)
-
-# component description overrides package description
-if(${component_description_var})
-  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${${component_description_var}})
-elseif(NOT CPACK_DEBIAN_PACKAGE_DESCRIPTION)
-  if(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-message(FATAL_ERROR "CPackDeb: Debian package requires a summary for a 
package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or 
CPACK_DEBIAN_PACKAGE_DESCRIPTION or ${component_description_var}")
-  endif()
-  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION

[Cmake-commits] CMake branch, next, updated. v3.6.1-1790-g8752d76

2016-09-05 Thread Daniel Pfeifer 
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  8752d765ae63edd5153a0547727989a4efe4d809 (commit)
   via  0039ffa2163665856be1e772146442f2c7418c6c (commit)
  from  425a1248b7c91f3bd1d2a4facbfca2b7889878a6 (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=8752d765ae63edd5153a0547727989a4efe4d809
commit 8752d765ae63edd5153a0547727989a4efe4d809
Merge: 425a124 0039ffa
Author: Daniel Pfeifer 
AuthorDate: Mon Sep 5 17:18:34 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 17:18:34 2016 -0400

Merge topic 'cm_nullptr' into next

0039ffa2 use CM_NULLPTR


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0039ffa2163665856be1e772146442f2c7418c6c
commit 0039ffa2163665856be1e772146442f2c7418c6c
Author: Daniel Pfeifer 
AuthorDate: Mon Sep 5 23:18:05 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Mon Sep 5 23:18:05 2016 +0200

use CM_NULLPTR

diff --git a/Source/cmFilePathUuid.h b/Source/cmFilePathUuid.h
index 87cfcf8..b54dc47 100644
--- a/Source/cmFilePathUuid.h
+++ b/Source/cmFilePathUuid.h
@@ -52,8 +52,9 @@ public:
* @arg outputPrefix optional string to prepend to the result
* @arg outputSuffix optional string to append to the result
*/
-  std::string get(const std::string& filePath, const char* outputPrefix = NULL,
-  const char* outputSuffix = NULL);
+  std::string get(const std::string& filePath,
+  const char* outputPrefix = CM_NULLPTR,
+  const char* outputSuffix = CM_NULLPTR);
 
 private:
   void initParentDirs(const std::string& currentSrcDir,
diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx
index 7c53a3d..9878912 100644
--- a/Source/cmXMLParser.cxx
+++ b/Source/cmXMLParser.cxx
@@ -20,10 +20,10 @@
 
 cmXMLParser::cmXMLParser()
 {
-  this->Parser = 0;
+  this->Parser = CM_NULLPTR;
   this->ParseError = 0;
-  this->ReportCallback = 0;
-  this->ReportCallbackData = 0;
+  this->ReportCallback = CM_NULLPTR;
+  this->ReportCallbackData = CM_NULLPTR;
 }
 
 cmXMLParser::~cmXMLParser()
@@ -64,7 +64,7 @@ int cmXMLParser::InitializeParser()
   }
 
   // Create the expat XML parser.
-  this->Parser = XML_ParserCreate(0);
+  this->Parser = XML_ParserCreate(CM_NULLPTR);
   XML_SetElementHandler(static_cast(this->Parser),
 , );
   XML_SetCharacterDataHandler(static_cast(this->Parser),
@@ -108,7 +108,7 @@ int cmXMLParser::CleanupParser()
 
   // Clean up the parser.
   XML_ParserFree(static_cast(this->Parser));
-  this->Parser = 0;
+  this->Parser = CM_NULLPTR;
 
   return result;
 }
@@ -165,7 +165,7 @@ const char* cmXMLParser::FindAttribute(const char** atts,
   }
 }
   }
-  return 0;
+  return CM_NULLPTR;
 }
 
 void cmXMLParserStartElement(void* parser, const char* name, const char** atts)
diff --git a/Tests/CMakeLib/run_compile_commands.cxx 
b/Tests/CMakeLib/run_compile_commands.cxx
index 529c830..0bf0a7c 100644
--- a/Tests/CMakeLib/run_compile_commands.cxx
+++ b/Tests/CMakeLib/run_compile_commands.cxx
@@ -148,7 +148,8 @@ int main()
it != end; ++it) {
 std::vector command;
 cmSystemTools::ParseUnixCommandLine(it->at("command").c_str(), command);
-if (!cmSystemTools::RunSingleCommand(command, 0, 0, 0,
+if (!cmSystemTools::RunSingleCommand(command, CM_NULLPTR, CM_NULLPTR,
+ CM_NULLPTR,
  it->at("directory").c_str())) {
   std::cout << "ERROR: Failed to run command \"" << command[0] << "\""
 << std::endl;
diff --git a/Tests/CMakeLib/testXMLSafe.cxx b/Tests/CMakeLib/testXMLSafe.cxx
index 356880c..c4aaf17 100644
--- a/Tests/CMakeLib/testXMLSafe.cxx
+++ b/Tests/CMakeLib/testXMLSafe.cxx
@@ -27,7 +27,7 @@ static test_pair const pairs[] = {
   { "angles <>", "angles " },
   { "ampersand &", "ampersand " },
   { "bad-byte \x80", "bad-byte [NON-UTF-8-BYTE-0x80]" },
-  { 0, 0 }
+  { CM_NULLPTR, CM_NULLPTR }
 };
 
 int testXMLSafe(int /*unused*/, char* /*unused*/ [])

---

Summary of changes:
 Source/cmFilePathUuid.h |5 +++--
 Source/cmXMLParser.cxx  |   12 ++--
 Tests/CMakeLib/run_compile_commands.cxx |3 ++-
 Tests/CMakeLib/testXMLSafe.cxx  |2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org

[Cmake-commits] CMake branch, next, updated. v3.6.1-1788-g425a124

2016-09-05 Thread Daniel Pfeifer 
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  425a1248b7c91f3bd1d2a4facbfca2b7889878a6 (commit)
   via  8d52b94262c0201b37aab554d306a037a48e0ca3 (commit)
  from  cb33be0a1655e5b9bd8abd609ac3c463182ac586 (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=425a1248b7c91f3bd1d2a4facbfca2b7889878a6
commit 425a1248b7c91f3bd1d2a4facbfca2b7889878a6
Merge: cb33be0 8d52b94
Author: Daniel Pfeifer 
AuthorDate: Mon Sep 5 16:35:49 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 16:35:49 2016 -0400

Merge topic 'qtdialog-tidy' into next

8d52b942 fixup! QtDialog: fix clang-tidy warnings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d52b94262c0201b37aab554d306a037a48e0ca3
commit 8d52b94262c0201b37aab554d306a037a48e0ca3
Author: Daniel Pfeifer 
AuthorDate: Mon Sep 5 22:35:31 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Mon Sep 5 22:35:31 2016 +0200

fixup! QtDialog: fix clang-tidy warnings

diff --git a/Source/QtDialog/Compilers.h b/Source/QtDialog/Compilers.h
index bdb1962..276e2a5 100644
--- a/Source/QtDialog/Compilers.h
+++ b/Source/QtDialog/Compilers.h
@@ -3,6 +3,8 @@
 #ifndef COMPILERS_HPP
 #define COMPILERS_HPP
 
+#include 
+
 #include 
 
 #include 
@@ -11,7 +13,7 @@ class Compilers : public QWidget, public Ui::Compilers
 {
   Q_OBJECT
 public:
-  Compilers(QWidget* p = NULL)
+  Compilers(QWidget* p = CM_NULLPTR)
 : QWidget(p)
   {
 this->setupUi(this);
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index a818c6b..7eadb09 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -13,6 +13,8 @@
 #ifndef QCMake_h
 #define QCMake_h
 
+#include 
+
 #include "cmake.h"
 
 #ifdef _MSC_VER
@@ -71,7 +73,7 @@ class QCMake : public QObject
 {
   Q_OBJECT
 public:
-  QCMake(QObject* p = 0);
+  QCMake(QObject* p = CM_NULLPTR);
   ~QCMake();
 public slots:
   /// load the cache file in a directory
diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h
index f1e87ce..0d95e63 100644
--- a/Source/QtDialog/QCMakeWidgets.h
+++ b/Source/QtDialog/QCMakeWidgets.h
@@ -13,6 +13,8 @@
 #ifndef QCMakeWidgets_h
 #define QCMakeWidgets_h
 
+#include 
+
 #include 
 #include 
 #include 
@@ -43,7 +45,7 @@ class QCMakePathEditor : public QCMakeFileEditor
 {
   Q_OBJECT
 public:
-  QCMakePathEditor(QWidget* p = NULL, const QString& var = QString());
+  QCMakePathEditor(QWidget* p = CM_NULLPTR, const QString& var = QString());
   void chooseFile();
 };
 
@@ -52,7 +54,8 @@ class QCMakeFilePathEditor : public QCMakeFileEditor
 {
   Q_OBJECT
 public:
-  QCMakeFilePathEditor(QWidget* p = NULL, const QString& var = QString());
+  QCMakeFilePathEditor(QWidget* p = CM_NULLPTR,
+   const QString& var = QString());
   void chooseFile();
 };
 

---

Summary of changes:
 Source/QtDialog/Compilers.h |4 +++-
 Source/QtDialog/QCMake.h|4 +++-
 Source/QtDialog/QCMakeWidgets.h |7 +--
 3 files changed, 11 insertions(+), 4 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, next, updated. v3.6.1-1786-gcb33be0

2016-09-05 Thread Daniel Pfeifer 
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  cb33be0a1655e5b9bd8abd609ac3c463182ac586 (commit)
   via  00b16a866aa3994263d7536a862225150c8dce1e (commit)
  from  83d0c9351f516f3793551e8b6ef8fcea054dc9f5 (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=cb33be0a1655e5b9bd8abd609ac3c463182ac586
commit cb33be0a1655e5b9bd8abd609ac3c463182ac586
Merge: 83d0c93 00b16a8
Author: Daniel Pfeifer 
AuthorDate: Mon Sep 5 16:12:57 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 16:12:57 2016 -0400

Merge topic 'qtdialog-tidy' into next

00b16a86 QtDialog: fix clang-tidy warnings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00b16a866aa3994263d7536a862225150c8dce1e
commit 00b16a866aa3994263d7536a862225150c8dce1e
Author: Daniel Pfeifer 
AuthorDate: Mon Sep 5 22:12:36 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Mon Sep 5 22:12:36 2016 +0200

QtDialog: fix clang-tidy warnings

diff --git a/Source/QtDialog/AddCacheEntry.cxx 
b/Source/QtDialog/AddCacheEntry.cxx
index dc7a4b0..a94c54b 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -64,7 +64,8 @@ QVariant AddCacheEntry::value() const
   QWidget* w = this->StackedWidget->currentWidget();
   if (qobject_cast(w)) {
 return static_cast(w)->text();
-  } else if (qobject_cast(w)) {
+  }
+  if (qobject_cast(w)) {
 return static_cast(w)->isChecked();
   }
   return QVariant();
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 5a8a5be..4de4bef 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -29,18 +29,19 @@
 
 #include "cmSystemTools.h" // IWYU pragma: keep
 
-static const char* cmDocumentationName[][2] = { { 0,
+static const char* cmDocumentationName[][2] = { { CM_NULLPTR,
   "  cmake-gui - CMake GUI." },
-{ 0, 0 } };
+{ CM_NULLPTR, CM_NULLPTR } };
 
 static const char* cmDocumentationUsage[][2] = {
-  { 0, "  cmake-gui [options]\n"
-   "  cmake-gui [options] \n"
-   "  cmake-gui [options] " },
-  { 0, 0 }
+  { CM_NULLPTR, "  cmake-gui [options]\n"
+"  cmake-gui [options] \n"
+"  cmake-gui [options] " },
+  { CM_NULLPTR, CM_NULLPTR }
 };
 
-static const char* cmDocumentationOptions[][2] = { { 0, 0 } };
+static const char* cmDocumentationOptions[]
+ [2] = { { CM_NULLPTR, CM_NULLPTR } };
 
 #if defined(Q_OS_MAC)
 static int cmOSXInstall(std::string dir);
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx 
b/Source/QtDialog/CMakeSetupDialog.cxx
index fda3e58..5b84597 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -41,7 +41,7 @@
 
 QCMakeThread::QCMakeThread(QObject* p)
   : QThread(p)
-  , CMakeInstance(NULL)
+  , CMakeInstance(CM_NULLPTR)
 {
 }
 
@@ -57,7 +57,7 @@ void QCMakeThread::run()
   emit this->cmakeInitialized();
   this->exec();
   delete this->CMakeInstance;
-  this->CMakeInstance = NULL;
+  this->CMakeInstance = CM_NULLPTR;
 }
 
 CMakeSetupDialog::CMakeSetupDialog()
diff --git a/Source/QtDialog/FirstConfigure.cxx 
b/Source/QtDialog/FirstConfigure.cxx
index ca5e3b5..c34751a 100644
--- a/Source/QtDialog/FirstConfigure.cxx
+++ b/Source/QtDialog/FirstConfigure.cxx
@@ -129,8 +129,9 @@ bool StartCompilerSetup::crossCompilerSetup() const
 
 void StartCompilerSetup::onSelectionChanged(bool on)
 {
-  if (on)
+  if (on) {
 selectionChanged();
+  }
 }
 
 void StartCompilerSetup::onGeneratorChanged(QString const& name)
@@ -144,12 +145,15 @@ void StartCompilerSetup::onGeneratorChanged(QString 
const& name)
 
 int StartCompilerSetup::nextId() const
 {
-  if (compilerSetup())
+  if (compilerSetup()) {
 return NativeSetup;
-  if (crossCompilerSetup())
+  }
+  if (crossCompilerSetup()) {
 return CrossSetup;
-  if (crossCompilerToolChainFile())
+  }
+  if (crossCompilerToolChainFile()) {
 return ToolchainSetup;
+  }
   return -1;
 }
 
@@ -515,7 +519,8 @@ QString FirstConfigure::getCCompiler() const
 {
   if (this->compilerSetup()) {
 return this->mNativeCompilerSetupPage->getCCompiler();
-  } else if (this->crossCompilerSetup()) {
+  }
+  if (this->crossCompilerSetup()) {
 return this->mCrossCompilerSetupPage->getCCompiler();
   }
   return QString();
@@ -525,7 +530,8 @@

[Cmake-commits] CMake branch, next, updated. v3.6.1-1784-g83d0c93

2016-09-05 Thread Daniel Pfeifer 
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  83d0c9351f516f3793551e8b6ef8fcea054dc9f5 (commit)
   via  1a9de8035c35cdb3e0501ce2cf2f816e4220bea0 (commit)
  from  9e42dba027b1e2860a21dcf3617f13c8adac7204 (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=83d0c9351f516f3793551e8b6ef8fcea054dc9f5
commit 83d0c9351f516f3793551e8b6ef8fcea054dc9f5
Merge: 9e42dba 1a9de80
Author: Daniel Pfeifer 
AuthorDate: Mon Sep 5 16:10:29 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 16:10:29 2016 -0400

Merge topic 'macro-parenthesis' into next

1a9de803 surround macro arguments with parentheses


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a9de8035c35cdb3e0501ce2cf2f816e4220bea0
commit 1a9de8035c35cdb3e0501ce2cf2f816e4220bea0
Author: Daniel Pfeifer 
AuthorDate: Mon Sep 5 22:09:49 2016 +0200
Commit: Daniel Pfeifer 
CommitDate: Mon Sep 5 22:09:49 2016 +0200

surround macro arguments with parentheses

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx 
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 0d3725d..377fee1 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -87,17 +87,17 @@ int cmCPackArchiveGenerator::addOneComponentToArchive(
  */
 #define DECLARE_AND_OPEN_ARCHIVE(filename, archive)   \
   cmGeneratedFileStream gf;   \
-  gf.Open(filename.c_str(), false, true); \
+  gf.Open((filename).c_str(), false, true);   \
   if (!GenerateHeader()) { \
 cmCPackLogger(cmCPackLog::LOG_ERROR,  \
   "Problem to generate Header for archive < " \
-<< filename << ">." << std::endl);\
+<< (filename) << ">." << std::endl);  \
 return 0; \
   }   \
   cmArchiveWrite archive(gf, this->Compress, this->ArchiveFormat);\
-  if (!archive) { \
+  if (!(archive)) {   \
 cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem to create archive < "   \
-<< filename << ">. ERROR =" << archive.GetError() \
+<< (filename) << ">. ERROR =" << (archive).GetError() \
 << std::endl);\
 return 0; \
   }
diff --git a/Source/CTest/cmCTestBuildHandler.cxx 
b/Source/CTest/cmCTestBuildHandler.cxx
index cdf292c..754bb5f 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -366,11 +366,11 @@ int cmCTestBuildHandler::ProcessHandler()
   regexes.clear();\
   cmCTestOptionalLog(this->CTest, DEBUG,  \
  this << "Add " #regexes << std::endl, this->Quiet);  \
-  for (it = strings.begin(); it != strings.end(); ++it) { \
+  for (it = (strings).begin(); it != (strings).end(); ++it) { \
 cmCTestOptionalLog(this->CTest, DEBUG,\
"Add " #strings ": " << *it << std::endl,  \
this->Quiet);  \
-regexes.push_back(it->c_str());   \
+(regexes).push_back(it->c_str()); \
   }
   cmCTestBuildHandlerPopulateRegexVector(this->CustomErrorMatches,
  this->ErrorMatchRegex);
diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx
index eec773f..91da239 100644
--- a/Source/cmCurl.cxx
+++ b/Source/cmCurl.cxx
@@ -25,9 +25,9 @@
 #endif
 
 #define check_curl_result(result, errstr) \
-  if (result != CURLE_OK && result != CURLE_NOT_BUILT_IN) {   \
+  if ((result) != CURLE_OK && (result) != CURLE_NOT_BUILT_IN) {   \
 e += e.empty() ? "" : "\n";   \
-

[Cmake-commits] CMake branch, next, updated. v3.6.1-1782-g9e42dba

2016-09-05 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  9e42dba027b1e2860a21dcf3617f13c8adac7204 (commit)
   via  72ecdd34cf6dbec293fe020e1aeed0a17a499061 (commit)
   via  fc3dab0ea956db618fe2b8ac413db846b422 (commit)
   via  4feba34d02fe42fd20209e5b247f91d8e0f7a2ac (commit)
  from  a7083a7af8037617200f7283e8167f315f13acf6 (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=9e42dba027b1e2860a21dcf3617f13c8adac7204
commit 9e42dba027b1e2860a21dcf3617f13c8adac7204
Merge: a7083a7 72ecdd3
Author: Brad King 
AuthorDate: Mon Sep 5 09:46:37 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 09:46:37 2016 -0400

Merge topic 'test-GenerateExportHeader-with-RunCMake' into next

72ecdd34 Tests: Cleanup RunCMake.GenerateExportHeader somewhat
fc3dab0e Tests: Port GenerateExportHeader test to RunCMake infrastructure
4feba34d GNU: Do not use -fvisibility on AIX or HP-UX


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72ecdd34cf6dbec293fe020e1aeed0a17a499061
commit 72ecdd34cf6dbec293fe020e1aeed0a17a499061
Author: Brad King 
AuthorDate: Thu Sep 1 15:38:46 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 5 09:45:42 2016 -0400

Tests: Cleanup RunCMake.GenerateExportHeader somewhat

diff --git a/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt 
b/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
index fb4d95e..dc92486 100644
--- a/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/CMakeLists.txt
@@ -1,3 +1,3 @@
-cmake_minimum_required(VERSION 2.8.5)
+cmake_minimum_required(VERSION 3.6)
 project(${RunCMake_TEST} NONE)
 include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt 
b/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt
deleted file mode 100644
index 8d98f9d..000
--- a/Tests/RunCMake/GenerateExportHeader/GEH-stderr.txt
+++ /dev/null
@@ -1 +0,0 @@
-.*
diff --git a/Tests/RunCMake/GenerateExportHeader/GEH.cmake 
b/Tests/RunCMake/GenerateExportHeader/GEH.cmake
index e2a2a3b..ee0871b 100644
--- a/Tests/RunCMake/GenerateExportHeader/GEH.cmake
+++ b/Tests/RunCMake/GenerateExportHeader/GEH.cmake
@@ -1,23 +1,8 @@
-cmake_minimum_required(VERSION 2.8.5 FATAL_ERROR)
-cmake_policy(SET CMP0054 NEW)
+# Test add_compiler_export_flags without deprecation warning.
+set(CMAKE_WARN_DEPRECATED OFF)
 
 project(GenerateExportHeader)
 
-# Prevent timeout on Watcom by not running the tests.
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES Watcom)
-  file(WRITE
-"${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
-"int main() { return 0; }
-  "
-  )
-
-  add_executable(
-GenerateExportHeader
-"${CMAKE_CURRENT_BINARY_DIR}/main.cxx"
-  )
-  return()
-endif()
-
 include(CheckCXXCompilerFlag)
 
 set( CMAKE_INCLUDE_CURRENT_DIR ON )
@@ -80,16 +65,16 @@ add_compiler_export_flags()
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR})
 
-message(" COMPILER_HAS_DEPRECATED: " ${COMPILER_HAS_DEPRECATED})
-message(" COMPILER_HAS_HIDDEN_VISIBILITY: " 
${COMPILER_HAS_HIDDEN_VISIBILITY})
-message(" WIN32: " ${WIN32})
-message(" HAS_WERROR_FLAG: " ${HAS_WERROR_FLAG})
+message(STATUS "COMPILER_HAS_DEPRECATED: " ${COMPILER_HAS_DEPRECATED})
+message(STATUS "COMPILER_HAS_HIDDEN_VISIBILITY: " 
${COMPILER_HAS_HIDDEN_VISIBILITY})
+message(STATUS "WIN32: " ${WIN32})
+message(STATUS "HAS_WERROR_FLAG: " ${HAS_WERROR_FLAG})
 
 set(link_libraries)
 macro(macro_add_test_library name)
   add_subdirectory(${name})
   include_directories(${name}
-${${name}_BINARY_DIR} # For the export header.
+${CMAKE_CURRENT_BINARY_DIR}/${name} # For the export header.
   )
   list(APPEND link_libraries ${name})
 endmacro()
@@ -132,7 +117,7 @@ elseif(COMPILER_HAS_DEPRECATED)
 else()
   set(_platform Empty)
 endif()
-message(" Testing reference: ${_platform}")
+message(STATUS "Testing reference: ${_platform}")
 target_compile_definitions(GenerateExportHeader
   PRIVATE
 "SRC_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/reference/${_platform}\""
diff --git a/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt 
b/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
index 9f8c8ef..77c18e0 100644
--- a/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
+++ b/Tests/RunCMake/GenerateExportHeader/c_identifier/CMakeLists.txt
@@ -1,5 +1,3 @@
-project(c_identifier)
-
 set(c_identifier_lib_SRCS
   c_identifier_class.cpp
 )
diff

[Cmake-commits] CMake branch, next, updated. v3.6.1-1778-ga7083a7

2016-09-05 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  a7083a7af8037617200f7283e8167f315f13acf6 (commit)
   via  87998458c98ed15d77a0dd129ad1bea4968247c8 (commit)
  from  f63cc7a5a50f65d8d087658a4cf7d780bbb3b041 (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=a7083a7af8037617200f7283e8167f315f13acf6
commit a7083a7af8037617200f7283e8167f315f13acf6
Merge: f63cc7a 8799845
Author: Brad King 
AuthorDate: Mon Sep 5 09:44:57 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 09:44:57 2016 -0400

Merge topic 'test-GenerateExportHeader-with-RunCMake' into next

87998458 Tests: Port GenerateExportHeader test to RunCMake infrastructure


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87998458c98ed15d77a0dd129ad1bea4968247c8
commit 87998458c98ed15d77a0dd129ad1bea4968247c8
Author: Brad King 
AuthorDate: Thu Sep 1 15:22:05 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 5 09:44:10 2016 -0400

Tests: Port GenerateExportHeader test to RunCMake infrastructure

This will allow build failure cases to be added later.

diff --git a/Tests/RunCMake/GenerateExportHeader/GEH-build-stderr.txt 
b/Tests/RunCMake/GenerateExportHeader/GEH-build-stderr.txt
new file mode 100644
index 000..8d98f9d
--- /dev/null
+++ b/Tests/RunCMake/GenerateExportHeader/GEH-build-stderr.txt
@@ -0,0 +1 @@
+.*

---

Summary of changes:
 .../GEH-build-stderr.txt}  |0
 1 file changed, 0 insertions(+), 0 deletions(-)
 copy Tests/RunCMake/{file/LOCK-error-timeout-stdout.txt => 
GenerateExportHeader/GEH-build-stderr.txt} (100%)


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.6.1-1776-gf63cc7a

2016-09-05 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  f63cc7a5a50f65d8d087658a4cf7d780bbb3b041 (commit)
   via  4f83077e2d3fffed1d86b1e14ea34343db62cc3a (commit)
   via  750789af426a2ae7f8374069f792371968281420 (commit)
  from  66afffaff5060f50c97db78c212ca8ccfa38c01d (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=f63cc7a5a50f65d8d087658a4cf7d780bbb3b041
commit f63cc7a5a50f65d8d087658a4cf7d780bbb3b041
Merge: 66afffa 4f83077
Author: Brad King 
AuthorDate: Mon Sep 5 09:29:42 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 5 09:29:42 2016 -0400

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.6.1-1773-g66afffa

2016-09-05 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  66afffaff5060f50c97db78c212ca8ccfa38c01d (commit)
   via  4ffdd564eb32be6147cb8610bbf6c0b5496fc56a (commit)
  from  462bb6d997f8726cb035bf6a8e79302b41d1d2a5 (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=66afffaff5060f50c97db78c212ca8ccfa38c01d
commit 66afffaff5060f50c97db78c212ca8ccfa38c01d
Merge: 462bb6d 4ffdd56
Author: Brad King 
AuthorDate: Mon Sep 5 09:26:49 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 09:26:49 2016 -0400

Merge topic 'cpack-deb-long-filenames' into next

4ffdd564 CPack/DEB: Add option to select archive type


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4ffdd564eb32be6147cb8610bbf6c0b5496fc56a
commit 4ffdd564eb32be6147cb8610bbf6c0b5496fc56a
Author: Domen Vrankar 
AuthorDate: Sun Sep 4 21:13:24 2016 +0200
Commit: Brad King 
CommitDate: Mon Sep 5 09:24:45 2016 -0400

CPack/DEB: Add option to select archive type

Add a `CPACK_DEBIAN_ARCHIVE_TYPE` option that can be used to select an
archive type that supports long file names.

Closes: #14332

diff --git a/Help/release/dev/cpack-deb-long-filenames.rst 
b/Help/release/dev/cpack-deb-long-filenames.rst
new file mode 100644
index 000..6113eaf
--- /dev/null
+++ b/Help/release/dev/cpack-deb-long-filenames.rst
@@ -0,0 +1,6 @@
+cpack-deb-long-filenames
+
+
+* The :module:`CPackDeb` module learned to support long file names
+  when archive format is set to GNU tar.
+  See :variable:`CPACK_DEBIAN_ARCHIVE_TYPE`
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index c9678d6..1a7b923 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -177,6 +177,24 @@
 #
 #  See https://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections
 #
+# .. variable:: CPACK_DEBIAN_ARCHIVE_TYPE
+#
+#  The archive format used for creating the Debian package.
+#
+#  * Mandatory : YES
+#  * Default   : "paxr"
+#
+#  Possible values are:
+#
+#  - paxr
+#  - gnutar
+#
+#  .. note::
+#
+#Default pax archive format is the most portable format and generates
+#packages that do not treat sparse files specially.
+#GNU tar format on the other hand supports longer filenames.
+#
 # .. variable:: CPACK_DEBIAN_COMPRESSION_TYPE
 #
 #  The compression used for creating the Debian package.
@@ -842,12 +860,24 @@ function(cpack_deb_prepare_package_vars)
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
   endif()
 
+  if(CPACK_DEBIAN_ARCHIVE_TYPE)
+set(archive_types_ "paxr;gnutar")
+cmake_policy(PUSH)
+  cmake_policy(SET CMP0057 NEW)
+  if(NOT CPACK_DEBIAN_ARCHIVE_TYPE IN_LIST archive_types_)
+message(FATAL_ERROR "CPACK_DEBIAN_ARCHIVE_TYPE set to unsupported"
+  "type ${CPACK_DEBIAN_ARCHIVE_TYPE}")
+  endif()
+cmake_policy(POP)
+  else()
+set(CPACK_DEBIAN_ARCHIVE_TYPE "paxr")
+  endif()
+
   # Compression: (recommended)
   if(NOT CPACK_DEBIAN_COMPRESSION_TYPE)
 set(CPACK_DEBIAN_COMPRESSION_TYPE "gzip")
   endif()
 
-
   # Recommends:
   # You should set: CPACK_DEBIAN_PACKAGE_RECOMMENDS
 
@@ -1000,6 +1030,7 @@ function(cpack_deb_prepare_package_vars)
   set(GEN_CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}" 
PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_PACKAGE_DESCRIPTION 
"${CPACK_DEBIAN_PACKAGE_DESCRIPTION}" PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS}" 
PARENT_SCOPE)
+  set(GEN_CPACK_DEBIAN_ARCHIVE_TYPE "${CPACK_DEBIAN_ARCHIVE_TYPE}" 
PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_COMPRESSION_TYPE "${CPACK_DEBIAN_COMPRESSION_TYPE}" 
PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_PACKAGE_RECOMMENDS "${CPACK_DEBIAN_PACKAGE_RECOMMENDS}" 
PARENT_SCOPE)
   set(GEN_CPACK_DEBIAN_PACKAGE_SUGGESTS "${CPACK_DEBIAN_PACKAGE_SUGGESTS}" 
PARENT_SCOPE)
diff --git a/Source/CPack/cmCPackDebGenerator.cxx 
b/Source/CPack/cmCPackDebGenerator.cxx
index 1f3ac51..b909598 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -419,6 +419,12 @@ int cmCPackDebGenerator::createDeb()
 << debian_compression_type << std::endl);
   }
 
+  const char* debian_archive_type =
+this->GetOption("GEN_CPACK_DEBIAN_ARCHIVE_TYPE");
+  if (!debian_archive_type) {
+debian_archive_type = "paxr";
+  }
+
   std::string filename_data_tar =
 strGenWDIR + "/data.tar" + compression_suffix;
 
@@ -431,7 +437,8 @@ int cmCPackDebGenerator::createDeb()
   << filename_data_tar

[Cmake-commits] CMake branch, next, updated. v3.6.1-1771-g462bb6d

2016-09-05 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  462bb6d997f8726cb035bf6a8e79302b41d1d2a5 (commit)
   via  0dd4aabd64ec6ae8cd94276c247139882bf2 (commit)
  from  6b3464e88428f1c3856c610901265bc5cf4b71f0 (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=462bb6d997f8726cb035bf6a8e79302b41d1d2a5
commit 462bb6d997f8726cb035bf6a8e79302b41d1d2a5
Merge: 6b3464e 0dd4aab
Author: Brad King 
AuthorDate: Mon Sep 5 09:24:33 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 09:24:33 2016 -0400

Merge topic 'cpack-deb-long-filenames' into next

0dd4aabd fixup! cpack-deb-long-filenames


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0dd4aabd64ec6ae8cd94276c247139882bf2
commit 0dd4aabd64ec6ae8cd94276c247139882bf2
Author: Brad King 
AuthorDate: Mon Sep 5 09:19:16 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 5 09:19:16 2016 -0400

fixup! cpack-deb-long-filenames

diff --git a/Source/CPack/cmCPackDebGenerator.cxx 
b/Source/CPack/cmCPackDebGenerator.cxx
index b960c0a..b909598 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -437,8 +437,7 @@ int cmCPackDebGenerator::createDeb()
   << filename_data_tar << "\" for writing" << std::endl);
   return 0;
 }
-cmArchiveWrite data_tar(fileStream_data_tar,
-tar_compression_type,
+cmArchiveWrite data_tar(fileStream_data_tar, tar_compression_type,
 debian_archive_type);
 
 // uid/gid should be the one of the root user, and this root user has

---

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |3 +--
 1 file changed, 1 insertion(+), 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, next, updated. v3.6.1-1769-g6b3464e

2016-09-05 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  6b3464e88428f1c3856c610901265bc5cf4b71f0 (commit)
   via  6bca9d652806b40346e7e80726784d16c7634640 (commit)
  from  40cbdc24ce4fa2171ed001ccb09e4ddbe6689909 (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=6b3464e88428f1c3856c610901265bc5cf4b71f0
commit 6b3464e88428f1c3856c610901265bc5cf4b71f0
Merge: 40cbdc2 6bca9d6
Author: Brad King 
AuthorDate: Mon Sep 5 09:14:46 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 09:14:46 2016 -0400

Merge topic 'test-GenerateExportHeader-with-RunCMake' into next

6bca9d65 fixup! Tests: Port GenerateExportHeader test to RunCMake 
infrastructure


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bca9d652806b40346e7e80726784d16c7634640
commit 6bca9d652806b40346e7e80726784d16c7634640
Author: Brad King 
AuthorDate: Mon Sep 5 09:14:32 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 5 09:14:32 2016 -0400

fixup! Tests: Port GenerateExportHeader test to RunCMake infrastructure

diff --git a/Utilities/Scripts/clang-format.bash 
b/Utilities/Scripts/clang-format.bash
index a9ef62b..a7080fc 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -126,7 +126,7 @@ $git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' 
'*.hpp' '*.hxx' |
   egrep -z -v '^Utilities/(KW|cm).*/' |
 
   # Exclude reference content.
-  egrep -z -v '^Tests/Module/GenerateExportHeader/reference/' |
+  egrep -z -v '^Tests/RunCMake/GenerateExportHeader/reference/' |
 
   # Exclude manually-formatted sources (e.g. with long lines).
   egrep -z -v '^Tests/PositionIndependentTargets/pic_test.h' |

---

Summary of changes:
 Utilities/Scripts/clang-format.bash |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.6.1-1767-g40cbdc2

2016-09-05 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  40cbdc24ce4fa2171ed001ccb09e4ddbe6689909 (commit)
   via  f6fd0abc5bbfa7d677cd090ba8e2894d96afdde8 (commit)
   via  f6428725bb0ae7e64866e3eca16a5ad8f007f916 (commit)
  from  083f1806004094f87741ba58655d7536dc05aa1d (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=40cbdc24ce4fa2171ed001ccb09e4ddbe6689909
commit 40cbdc24ce4fa2171ed001ccb09e4ddbe6689909
Merge: 083f180 f6fd0ab
Author: Brad King 
AuthorDate: Mon Sep 5 09:11:40 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Sep 5 09:11:40 2016 -0400

Merge topic 'genex-LINK_ONLY-not-linking' into next

f6fd0abc Genex: Diagnose invalid LINK_ONLY usage instead of crashing
f6428725 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6fd0abc5bbfa7d677cd090ba8e2894d96afdde8
commit f6fd0abc5bbfa7d677cd090ba8e2894d96afdde8
Author: Brad King 
AuthorDate: Mon Sep 5 09:04:30 2016 -0400
Commit: Brad King 
CommitDate: Mon Sep 5 09:06:00 2016 -0400

Genex: Diagnose invalid LINK_ONLY usage instead of crashing

When `$` is used outside of linking we may evaluate it
without a `dagChecker`.  Do not dereference the NULL pointer and issue a
diagnostic instead.

Closes: #16287

diff --git a/Source/cmGeneratorExpressionNode.cxx 
b/Source/cmGeneratorExpressionNode.cxx
index 44e9ce1..c19a741 100644
--- a/Source/cmGeneratorExpressionNode.cxx
+++ b/Source/cmGeneratorExpressionNode.cxx
@@ -672,15 +672,20 @@ static const struct LinkOnlyNode : public 
cmGeneratorExpressionNode
   LinkOnlyNode() {}
 
   std::string Evaluate(const std::vector& parameters,
-   cmGeneratorExpressionContext* /*context*/,
-   const GeneratorExpressionContent* /*content*/,
+   cmGeneratorExpressionContext* context,
+   const GeneratorExpressionContent* content,
cmGeneratorExpressionDAGChecker* dagChecker) const
 CM_OVERRIDE
   {
+if (!dagChecker) {
+  reportError(context, content->GetOriginalExpression(),
+  "$ may only be used for linking");
+  return std::string();
+}
 if (!dagChecker->GetTransitivePropertiesOnly()) {
   return parameters.front();
 }
-return "";
+return std::string();
   }
 } linkOnlyNode;
 
diff --git 
a/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking-result.txt 
b/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking-result.txt
new file mode 100644
index 000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking-result.txt
@@ -0,0 +1 @@
+1
diff --git 
a/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking-stderr.txt 
b/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking-stderr.txt
new file mode 100644
index 000..cded130
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at LINK_ONLY-not-linking.cmake:1 \(add_custom_target\):
+  Error evaluating generator expression:
+
+\$
+
+  \$ may only be used for linking
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking.cmake 
b/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking.cmake
new file mode 100644
index 000..16db0a2
--- /dev/null
+++ b/Tests/RunCMake/GeneratorExpression/LINK_ONLY-not-linking.cmake
@@ -0,0 +1 @@
+add_custom_target(Custom ALL COMMAND ${CMAKE_COMMAND} -E echo 
$)
diff --git a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake 
b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
index 625bab2..f5584d5 100644
--- a/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
@@ -29,6 +29,7 @@ run_cmake(COMPILE_LANGUAGE-unknown-lang)
 run_cmake(TARGET_FILE-recursion)
 run_cmake(OUTPUT_NAME-recursion)
 run_cmake(TARGET_PROPERTY-LOCATION)
+run_cmake(LINK_ONLY-not-linking)
 
 run_cmake(ImportedTarget-TARGET_PDB_FILE)
 if(LINKER_SUPPORTS_PDB)

---

Summary of changes:
 Source/CMakeVersion.cmake   |2 +-
 Source/cmGeneratorExpressionNode.cxx|   11 ---
 .../LINK_ONLY-not-linking-result.txt}   |0
 .../GeneratorExpression/LINK_ONLY-not-linking-stderr.txt|8