[Cmake-commits] CMake branch, master, updated. v3.7.0-570-g706d05e

2016-11-17 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  706d05e71ad183b0e07f5f33feda498f04f52fa0 (commit)
  from  0e9634d2c90fd748774f9238219cb1661550f233 (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=706d05e71ad183b0e07f5f33feda498f04f52fa0
commit 706d05e71ad183b0e07f5f33feda498f04f52fa0
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Fri Nov 18 00:01:04 2016 -0500
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Nov 18 00:01:04 2016 -0500

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 3c1e9a4..c443ca8 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 7)
-set(CMake_VERSION_PATCH 20161117)
+set(CMake_VERSION_PATCH 20161118)
 #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.7.0-1247-ga3fb155

2016-11-17 Thread Gregor Jasny via Cmake-commits 
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  a3fb155f636bbe567353b34b62c766ee19c43dae (commit)
   via  c0e223cd2ad78abc698c517004101a3eb48214c4 (commit)
  from  077c70d310c18d7f93ca926e166316d645d30e7e (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=a3fb155f636bbe567353b34b62c766ee19c43dae
commit a3fb155f636bbe567353b34b62c766ee19c43dae
Merge: 077c70d c0e223c
Author: Gregor Jasny 
AuthorDate: Thu Nov 17 16:40:11 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 16:40:11 2016 -0500

Merge topic 'xcode-add-override-keyword' into next

c0e223cd Xcode: Add override keyword to suppress warnings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0e223cd2ad78abc698c517004101a3eb48214c4
commit c0e223cd2ad78abc698c517004101a3eb48214c4
Author: Gregor Jasny 
AuthorDate: Thu Nov 17 22:39:46 2016 +0100
Commit: Gregor Jasny 
CommitDate: Thu Nov 17 22:39:46 2016 +0100

Xcode: Add override keyword to suppress warnings

diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index ded8073..98625d1 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -23,7 +23,7 @@ public:
   static cmGlobalGeneratorFactory* NewFactory();
 
   ///! Get the name for the generator.
-  virtual std::string GetName() const
+  std::string GetName() const CM_OVERRIDE
   {
 return cmGlobalXCodeGenerator::GetActualName();
   }
@@ -33,51 +33,53 @@ public:
   static void GetDocumentation(cmDocumentationEntry& entry);
 
   ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf);
+  cmLocalGenerator* CreateLocalGenerator(cmMakefile* mf) CM_OVERRIDE;
 
   /**
* Try to determine system information such as shared library
* extension, pthreads, byte order etc.
*/
-  virtual void EnableLanguage(std::vector const& languages,
-  cmMakefile*, bool optional);
+  void EnableLanguage(std::vector const& languages, cmMakefile*,
+  bool optional) CM_OVERRIDE;
   /**
* Try running cmake and building a file. This is used for dynalically
* loaded commands, not as part of the usual build process.
*/
-  virtual void GenerateBuildCommand(
-std::vector& makeCommand, const std::string& makeProgram,
-const std::string& projectName, const std::string& projectDir,
-const std::string& targetName, const std::string& config, bool fast,
-bool verbose,
-std::vector const& makeOptions = std::vector());
+  void GenerateBuildCommand(std::vector& makeCommand,
+const std::string& makeProgram,
+const std::string& projectName,
+const std::string& projectDir,
+const std::string& targetName,
+const std::string& config, bool fast, bool verbose,
+std::vector const& makeOptions =
+  std::vector()) CM_OVERRIDE;
 
   /** Append the subdirectory for the given configuration.  */
-  virtual void AppendDirectoryForConfig(const std::string& prefix,
-const std::string& config,
-const std::string& suffix,
-std::string& dir);
+  void AppendDirectoryForConfig(const std::string& prefix,
+const std::string& config,
+const std::string& suffix,
+std::string& dir) CM_OVERRIDE;
 
   bool FindMakeProgram(cmMakefile*) CM_OVERRIDE;
 
   ///! What is the configurations directory variable called?
-  virtual const char* GetCMakeCFGIntDir() const;
+  const char* GetCMakeCFGIntDir() const CM_OVERRIDE;
   ///! expand CFGIntDir
-  virtual std::string ExpandCFGIntDir(const std::string& str,
-  const std::string& config) const;
+  std::string ExpandCFGIntDir(const std::string& str,
+  const std::string& config) const CM_OVERRIDE;
 
   void SetCurrentLocalGenerator(cmLocalGenerator*);
 
   /** Return true if the generated build tree may contain multiple builds.
   i.e. "Can I build Debug and Release in the same tree?" */
-  virtual bool IsMultiConfig() const;
+  bool IsMultiConfig() const CM_OVERRIDE;
 
-  virtual bool SetGeneratorToolset(std::string const& ts, cmMakefile* mf);
+

[Cmake-commits] CMake branch, next, updated. v3.7.0-1245-g077c70d

2016-11-17 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  077c70d310c18d7f93ca926e166316d645d30e7e (commit)
   via  2dafeacb75e54cfe6c5dc17f253ebdcc61a99e47 (commit)
  from  f31f22974fb00b2a63998947117ce7170afebbd6 (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=077c70d310c18d7f93ca926e166316d645d30e7e
commit 077c70d310c18d7f93ca926e166316d645d30e7e
Merge: f31f229 2dafeac
Author: Brad King 
AuthorDate: Thu Nov 17 16:13:11 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 16:13:11 2016 -0500

Merge topic 'update-prebuilt-openssl' into next

2dafeacb Utilities/Release: Update to openssl-1.0.2j


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dafeacb75e54cfe6c5dc17f253ebdcc61a99e47
commit 2dafeacb75e54cfe6c5dc17f253ebdcc61a99e47
Author: Brad King 
AuthorDate: Thu Nov 17 16:12:36 2016 -0500
Commit: Brad King 
CommitDate: Thu Nov 17 16:12:36 2016 -0500

Utilities/Release: Update to openssl-1.0.2j

Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.

diff --git a/Utilities/Release/linux64_release.cmake 
b/Utilities/Release/linux64_release.cmake
index b9447ca..feba2a5 100644
--- a/Utilities/Release/linux64_release.cmake
+++ b/Utilities/Release/linux64_release.cmake
@@ -29,9 +29,9 @@ 
CURSES_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libncurses.a
 CURSES_INCLUDE_PATH:PATH=/home/kitware/ncurses-5.9/include
 FORM_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libform.a
 CMAKE_USE_OPENSSL:BOOL=ON
-OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libcrypto.a
-OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2h/include
-OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2h/lib/libssl.a
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2j/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2j/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2j/lib/libssl.a
 PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3
 CPACK_SYSTEM_NAME:STRING=Linux-x86_64
 BUILD_QtDialog:BOOL:=TRUE

---

Summary of changes:
 Utilities/Release/linux64_release.cmake |6 +++---
 1 file changed, 3 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, next, updated. v3.7.0-1243-gf31f229

2016-11-17 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  f31f22974fb00b2a63998947117ce7170afebbd6 (commit)
   via  427b6da9e5aa2e1a8570259573b1faa15e4169df (commit)
  from  073b3aef7631cff92db311c7df53dbf69b7d2100 (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=f31f22974fb00b2a63998947117ce7170afebbd6
commit f31f22974fb00b2a63998947117ce7170afebbd6
Merge: 073b3ae 427b6da
Author: Brad King 
AuthorDate: Thu Nov 17 15:56:20 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 15:56:20 2016 -0500

Merge topic 'auto_project_regeneration' into next

427b6da9 VS: Teach `cmake --build` to reconfigure if needed before building


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=427b6da9e5aa2e1a8570259573b1faa15e4169df
commit 427b6da9e5aa2e1a8570259573b1faa15e4169df
Author: Yves Frederix 
AuthorDate: Fri Sep 16 17:50:06 2016 +0200
Commit: Brad King 
CommitDate: Thu Nov 17 13:53:42 2016 -0500

VS: Teach `cmake --build` to reconfigure if needed before building

Visual Studio's build system does not cleanly handle itself being
re-generated during the build.  Teach `cmake --build` to check whether
the build system needs to be re-generated before launching the native
build tool.

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx 
b/Source/cmGlobalVisualStudio8Generator.cxx
index 64808c9..cf37c2c 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -161,6 +161,11 @@ void cmGlobalVisualStudio8Generator::GetDocumentation(
   entry.Brief = "Generates Visual Studio 8 2005 project files.";
 }
 
+std::string cmGlobalVisualStudio8Generator::GetGenerateStampList()
+{
+  return "generate.stamp.list";
+}
+
 void cmGlobalVisualStudio8Generator::Configure()
 {
   this->cmGlobalVisualStudio7Generator::Configure();
@@ -244,7 +249,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
   // Create a list of all stamp files for this project.
   std::vector stamps;
   std::string stampList = cmake::GetCMakeFilesDirectoryPostSlash();
-  stampList += "generate.stamp.list";
+  stampList += cmGlobalVisualStudio8Generator::GetGenerateStampList();
   {
 std::string stampListFile =
   generators[0]->GetMakefile()->GetCurrentBinaryDirectory();
diff --git a/Source/cmGlobalVisualStudio8Generator.h 
b/Source/cmGlobalVisualStudio8Generator.h
index b149c9d..53feb47 100644
--- a/Source/cmGlobalVisualStudio8Generator.h
+++ b/Source/cmGlobalVisualStudio8Generator.h
@@ -23,6 +23,9 @@ public:
   /** Get the documentation entry for this generator.  */
   static void GetDocumentation(cmDocumentationEntry& entry);
 
+  /** Get the name of the main stamp list file. */
+  static std::string GetGenerateStampList();
+
   virtual void EnableLanguage(std::vector const& languages,
   cmMakefile*, bool optional);
   virtual void AddPlatformDefinitions(cmMakefile* mf);
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 6c066c6..59290ff 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -129,8 +129,8 @@ typedef CM_UNORDERED_MAP 
JsonValueMapType;
 
 } // namespace
 
-static bool cmakeCheckStampFile(const char* stampName);
-static bool cmakeCheckStampList(const char* stampName);
+static bool cmakeCheckStampFile(const char* stampName, bool verbose = true);
+static bool cmakeCheckStampList(const char* stampList, bool verbose = true);
 
 void cmWarnUnusedCliWarning(const std::string& variable, int /*unused*/,
 void* ctx, const char* /*unused*/,
@@ -2233,7 +2233,7 @@ int cmake::GetSystemInformation(std::vector& 
args)
   return 0;
 }
 
-static bool cmakeCheckStampFile(const char* stampName)
+static bool cmakeCheckStampFile(const char* stampName, bool verbose)
 {
   // The stamp file does not exist.  Use the stamp dependencies to
   // determine whether it is really out of date.  This works in
@@ -2287,11 +2287,13 @@ static bool cmakeCheckStampFile(const char* stampName)
 stamp << "# CMake generation timestamp file for this directory.\n";
   }
   if (cmSystemTools::RenameFile(stampTemp, stampName)) {
-// Notify the user why CMake is not re-running.  It is safe to
-// just print to stdout here because this code is only reachable
-// through an undocumented flag used by the VS generator.
-std::cout << "CMake does not need to re-run because " << stampName
-  << " is up-to-date.\n";
+if (verbose) {
+  // Notify the user why CMake

[Cmake-commits] CMake branch, next, updated. v3.7.0-1241-g073b3ae

2016-11-17 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  073b3aef7631cff92db311c7df53dbf69b7d2100 (commit)
   via  024451383827969c30f71c5335c66f348193a2d7 (commit)
  from  af3ae22aaa5397fe0b904b7de138740da402ad9e (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=073b3aef7631cff92db311c7df53dbf69b7d2100
commit 073b3aef7631cff92db311c7df53dbf69b7d2100
Merge: af3ae22 0244513
Author: Brad King 
AuthorDate: Thu Nov 17 13:47:20 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 13:47:20 2016 -0500

Merge topic 'ExternalProject-cmd-poisoning' into next

02445138 ExternalProject: Do not trip over pre-existing 'cmd' variable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=024451383827969c30f71c5335c66f348193a2d7
commit 024451383827969c30f71c5335c66f348193a2d7
Author: Karsten Sperling 
AuthorDate: Thu Nov 17 20:40:59 2016 +1300
Commit: Brad King 
CommitDate: Thu Nov 17 13:40:29 2016 -0500

ExternalProject: Do not trip over pre-existing 'cmd' variable

Callers of `_ep_get_build_command` do not initialize the output variable
they pass and expect the function to unconditionally set it.  Revise the
function to not check its own output variable.  Otherwise if a `cmd`
variable happens to be set when `ExternalProject_Add` is called then it
will be erroneously used as the default `BUILD`, `TEST`, and `INSTALL`
command.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index c20806d..a0f731c 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1245,87 +1245,84 @@ endfunction()
 
 
 function(_ep_get_build_command name step cmd_var)
-  set(cmd "${${cmd_var}}")
-  if(NOT cmd)
-set(args)
-_ep_get_configure_command_id(${name} cfg_cmd_id)
-if(cfg_cmd_id STREQUAL "cmake")
-  # CMake project.  Select build command based on generator.
-  get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
-  if("${CMAKE_GENERATOR}" MATCHES "Make" AND
- ("${cmake_generator}" MATCHES "Make" OR NOT cmake_generator))
-# The project uses the same Makefile generator.  Use recursive make.
-set(cmd "$(MAKE)")
-if(step STREQUAL "INSTALL")
-  set(args install)
-endif()
-if("x${step}x" STREQUAL "xTESTx")
-  set(args test)
-endif()
-  else()
-# Drive the project with "cmake --build".
-get_target_property(cmake_command ${name} _EP_CMAKE_COMMAND)
-if(cmake_command)
-  set(cmd "${cmake_command}")
-else()
-  set(cmd "${CMAKE_COMMAND}")
-endif()
-set(args --build ".")
-if(CMAKE_CONFIGURATION_TYPES)
-  if (CMAKE_CFG_INTDIR AND
-  NOT CMAKE_CFG_INTDIR STREQUAL "." AND
-  NOT CMAKE_CFG_INTDIR MATCHES "\\$")
-# CMake 3.4 and below used the CMAKE_CFG_INTDIR placeholder value
-# provided by multi-configuration generators.  Some projects were
-# taking advantage of that undocumented implementation detail to
-# specify a specific configuration here.  They should use
-# BUILD_COMMAND to change the default command instead, but for
-# compatibility honor the value.
-set(config ${CMAKE_CFG_INTDIR})
-message(AUTHOR_WARNING "CMAKE_CFG_INTDIR should not be set by 
project code.\n"
-  "To get a non-default build command, use the BUILD_COMMAND 
option.")
-  else()
-set(config $)
-  endif()
-  list(APPEND args --config ${config})
-endif()
-if(step STREQUAL "INSTALL")
-  list(APPEND args --target install)
-endif()
-# But for "TEST" drive the project with corresponding "ctest".
-if("x${step}x" STREQUAL "xTESTx")
-  string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd 
"${cmd}")
-  set(args "")
-  if(CMAKE_CONFIGURATION_TYPES)
-list(APPEND args -C ${config})
-  endif()
-endif()
+  set(cmd "")
+  set(args)
+  _ep_get_configure_command_id(${name} cfg_cmd_id)
+  if(cfg_cmd_id STREQUAL "cmake")
+# CMake project.  Select build command based on generator.
+get_target_property(cmake_generator ${name} _EP_CMAKE_GENERATOR)
+if("${CMAKE_GENERATOR}" MATCHES "Make" AND
+   ("${cmake_generator}" MATCHES "Make" OR NOT cmake_generator))
+  # The project uses the same Makefile generator.  Use recursive

[Cmake-commits] CMake branch, next, updated. v3.7.0-1239-gaf3ae22

2016-11-17 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  af3ae22aaa5397fe0b904b7de138740da402ad9e (commit)
   via  f5065d58f331268f22d3a433a60a60dbbecac0d4 (commit)
   via  d9ed2bbdfb2addfc64cd36c78453b945aa73815a (commit)
   via  420225ada23d2a72e16cc8ded6b2f21189eee3b3 (commit)
  from  db1ee8ada8a5c3e4dc286772663b2b6d2da190b1 (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=af3ae22aaa5397fe0b904b7de138740da402ad9e
commit af3ae22aaa5397fe0b904b7de138740da402ad9e
Merge: db1ee8a f5065d5
Author: Brad King 
AuthorDate: Thu Nov 17 13:28:45 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 13:28:45 2016 -0500

Merge topic 'capture-clang-tidy-errors' into next

f5065d58 cmake: Report if the _CLANG_TIDY tool exits with non-zero
d9ed2bbd cmake: If ldd for LINK_WHAT_YOU_USE fails to run then report why
420225ad cmake: Comment why we ignore the include-what-you-use return code


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5065d58f331268f22d3a433a60a60dbbecac0d4
commit f5065d58f331268f22d3a433a60a60dbbecac0d4
Author: Brad King 
AuthorDate: Thu Nov 17 11:36:04 2016 -0500
Commit: Brad King 
CommitDate: Thu Nov 17 11:49:53 2016 -0500

cmake: Report if the _CLANG_TIDY tool exits with non-zero

When using `_CLANG_TIDY` our internal launcher for the tool must
capture its return code and stderr and report them on failure.
Otherwise incorrect command lines silently fail.

Closes: #16435

diff --git a/Help/release/dev/capture-clang-tidy-errors.rst 
b/Help/release/dev/capture-clang-tidy-errors.rst
new file mode 100644
index 000..14c32e6
--- /dev/null
+++ b/Help/release/dev/capture-clang-tidy-errors.rst
@@ -0,0 +1,6 @@
+capture-clang-tidy-errors
+-
+
+* If a command specified by the :prop_tgt:`_CLANG_TIDY` target property
+  returns non-zero at build time this is now treated as an error instead of
+  silently ignored.
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index dca5ffc..8431945 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -358,11 +358,13 @@ int cmcmd::ExecuteCMakeCommand(std::vector& 
args)
 
 // Run the tidy command line.  Capture its stdout and hide its stderr.
 std::string stdOut;
-if (!cmSystemTools::RunSingleCommand(tidy_cmd, , CM_NULLPTR,
- , CM_NULLPTR,
- cmSystemTools::OUTPUT_NONE)) {
-  std::cerr << "Error running '" << tidy_cmd[0] << "'\n";
-  return 1;
+std::string stdErr;
+if (!cmSystemTools::RunSingleCommand(tidy_cmd, , , ,
+ CM_NULLPTR,
+ cmSystemTools::OUTPUT_NONE) ||
+ret != 0) {
+  std::cerr << "Error running '" << tidy_cmd[0] << "':\n" << stdErr;
+  return ret != 0 ? ret : 1;
 }
 // Output the stdout from clang-tidy to stderr
 std::cerr << stdOut;
diff --git a/Tests/RunCMake/ClangTidy/C-bad-Build-result.txt 
b/Tests/RunCMake/ClangTidy/C-bad-Build-result.txt
new file mode 100644
index 000..d197c91
--- /dev/null
+++ b/Tests/RunCMake/ClangTidy/C-bad-Build-result.txt
@@ -0,0 +1 @@
+[^0]
diff --git a/Tests/RunCMake/ClangTidy/C-bad-Build-stdout.txt 
b/Tests/RunCMake/ClangTidy/C-bad-Build-stdout.txt
new file mode 100644
index 000..ef0afe5
--- /dev/null
+++ b/Tests/RunCMake/ClangTidy/C-bad-Build-stdout.txt
@@ -0,0 +1,2 @@
+Error running '[^']*Tests/RunCMake/pseudo_tidy[^']*':
+bad command line arg '-bad'
diff --git a/Tests/RunCMake/ClangTidy/C-bad.cmake 
b/Tests/RunCMake/ClangTidy/C-bad.cmake
new file mode 100644
index 000..aa54c08
--- /dev/null
+++ b/Tests/RunCMake/ClangTidy/C-bad.cmake
@@ -0,0 +1,3 @@
+enable_language(C)
+set(CMAKE_C_CLANG_TIDY "${PSEUDO_TIDY}" -bad)
+add_executable(main main.c)
diff --git a/Tests/RunCMake/ClangTidy/RunCMakeTest.cmake 
b/Tests/RunCMake/ClangTidy/RunCMakeTest.cmake
index 27cd922..2f41e50 100644
--- a/Tests/RunCMake/ClangTidy/RunCMakeTest.cmake
+++ b/Tests/RunCMake/ClangTidy/RunCMakeTest.cmake
@@ -20,3 +20,4 @@ if (NOT RunCMake_GENERATOR STREQUAL "Watcom WMake")
   run_tidy(C-launch)
   run_tidy(CXX-launch)
 endif()
+run_tidy(C-bad)
diff --git a/Tests/RunCMake/pseudo_tidy.c b/Tests/RunCMake/pseudo_tidy.c
index c950d03..f435e47 100644
--- a/Tests/RunCMake/pseudo_tidy.c
+++ b/Tests/RunCMake/pseudo_tidy.c
@@ -1,9 +1,14 @@
 #include 
+#include 
 
 int main(int argc, char*

[Cmake-commits] CMake branch, next, updated. v3.7.0-1235-gdb1ee8a

2016-11-17 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  db1ee8ada8a5c3e4dc286772663b2b6d2da190b1 (commit)
   via  25b6e7b710d7739cca44ed19bf45a190e72a6b82 (commit)
  from  aa6407263676127da94b4f5517410709fb47a2cc (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=db1ee8ada8a5c3e4dc286772663b2b6d2da190b1
commit db1ee8ada8a5c3e4dc286772663b2b6d2da190b1
Merge: aa64072 25b6e7b
Author: Brad King 
AuthorDate: Thu Nov 17 10:36:42 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 10:36:42 2016 -0500

Merge topic 'tolerate-removed-cache' into next

25b6e7b7 Tolerate removed/replaced CMakeCache.txt with old CMakeFiles/


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25b6e7b710d7739cca44ed19bf45a190e72a6b82
commit 25b6e7b710d7739cca44ed19bf45a190e72a6b82
Author: Brad King 
AuthorDate: Thu Nov 17 10:29:55 2016 -0500
Commit: Brad King 
CommitDate: Thu Nov 17 10:29:58 2016 -0500

Tolerate removed/replaced CMakeCache.txt with old CMakeFiles/

Users or scripts commonly remove or replace `CMakeCache.txt` without
also removing `CMakeFiles/`.  In this case the information saved in the
cache from platform information initialization is missing, so we need to
re-initialize it.  In such a case, remove the platform information
directory so that re-initialization will occur and restore needed
information to the cache.

Closes: #14820

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index fa447ff..2808051 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -50,6 +50,9 @@
 #include 
 #endif
 
+const std::string kCMAKE_PLATFORM_INFO_INITIALIZED =
+  "CMAKE_PLATFORM_INFO_INITIALIZED";
+
 class cmInstalledFile;
 
 bool cmTarget::StrictTargetComparison::operator()(cmTarget const* t1,
@@ -428,6 +431,23 @@ void cmGlobalGenerator::EnableLanguage(
   // set the dir for parent files so they can be used by modules
   mf->AddDefinition("CMAKE_PLATFORM_INFO_DIR", rootBin.c_str());
 
+  if (!this->CMakeInstance->GetIsInTryCompile()) {
+// Keep a mark in the cache to indicate that we've initialized the
+// platform information directory.  If the platform information
+// directory exists but the mark is missing then CMakeCache.txt
+// has been removed or replaced without also removing the CMakeFiles/
+// directory.  In this case remove the platform information directory
+// so that it will be re-initialized and the relevant information
+// restored in the cache.
+if (cmSystemTools::FileIsDirectory(rootBin) &&
+!mf->IsOn(kCMAKE_PLATFORM_INFO_INITIALIZED)) {
+  cmSystemTools::RemoveADirectory(rootBin);
+}
+this->GetCMakeInstance()->AddCacheEntry(
+  kCMAKE_PLATFORM_INFO_INITIALIZED, "1",
+  "Platform information initialized", cmStateEnums::INTERNAL);
+  }
+
   // find and make sure CMAKE_MAKE_PROGRAM is defined
   if (!this->FindMakeProgram(mf)) {
 return;
diff --git a/Tests/RunCMake/Configure/RemoveCache-stdout.txt 
b/Tests/RunCMake/Configure/RemoveCache-stdout.txt
new file mode 100644
index 000..73e7e5d
--- /dev/null
+++ b/Tests/RunCMake/Configure/RemoveCache-stdout.txt
@@ -0,0 +1 @@
+-- The C compiler identification is
diff --git a/Tests/RunCMake/Configure/RemoveCache.cmake 
b/Tests/RunCMake/Configure/RemoveCache.cmake
new file mode 100644
index 000..304918f
--- /dev/null
+++ b/Tests/RunCMake/Configure/RemoveCache.cmake
@@ -0,0 +1,17 @@
+enable_language(C)
+
+set(vars
+  CMAKE_EXECUTABLE_FORMAT
+  )
+
+if(CMAKE_HOST_UNIX)
+  list(APPEND vars
+CMAKE_UNAME
+)
+endif()
+
+foreach(v IN LISTS vars)
+  if(NOT DEFINED ${v})
+message(SEND_ERROR "Variable '${v}' is not set!")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/Configure/RunCMakeTest.cmake 
b/Tests/RunCMake/Configure/RunCMakeTest.cmake
index 91adb4e..4a135be 100644
--- a/Tests/RunCMake/Configure/RunCMakeTest.cmake
+++ b/Tests/RunCMake/Configure/RunCMakeTest.cmake
@@ -24,3 +24,12 @@ file(WRITE "${depend}" "2")
 run_cmake_command(RerunCMake-build2 ${CMAKE_COMMAND} --build .)
 unset(RunCMake_TEST_BINARY_DIR)
 unset(RunCMake_TEST_NO_CLEAN)
+
+# Use a single build tree for a few tests without cleaning.
+set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/RemoveCache-build)
+set(RunCMake_TEST_NO_CLEAN 1)
+file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+run_cmake(RemoveCache)
+file(REMOVE "${RunCMake_TEST_BINARY_DIR}/CMakeCache.txt")

[Cmake-commits] CMake branch, next, updated. v3.7.0-1233-gaa64072

2016-11-17 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  aa6407263676127da94b4f5517410709fb47a2cc (commit)
   via  0e9634d2c90fd748774f9238219cb1661550f233 (commit)
   via  e67a59b00d08b426272c86771690782e5cc7f97f (commit)
   via  8dd3c319c9baa60459df6b368440d8a7f0857580 (commit)
   via  837d1359ee4d227476154d81de41f4af5ecf2c7c (commit)
   via  ab4a9a98266fb29008cecc9649a91fc844c541f5 (commit)
  from  db48adff5a6075554e2cd681bb0d4a5414af6e38 (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=aa6407263676127da94b4f5517410709fb47a2cc
commit aa6407263676127da94b4f5517410709fb47a2cc
Merge: db48adf 0e9634d
Author: Brad King 
AuthorDate: Thu Nov 17 09:40:45 2016 -0500
Commit: Brad King 
CommitDate: Thu Nov 17 09:40:45 2016 -0500

Merge branch 'master' into next


---

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, master, updated. v3.7.0-565-ge67a59b

2016-11-17 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  e67a59b00d08b426272c86771690782e5cc7f97f (commit)
   via  da0e3f90967bccfa31be347f703d637c52621a64 (commit)
  from  8dd3c319c9baa60459df6b368440d8a7f0857580 (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=e67a59b00d08b426272c86771690782e5cc7f97f
commit e67a59b00d08b426272c86771690782e5cc7f97f
Merge: 8dd3c31 da0e3f9
Author: Brad King 
AuthorDate: Thu Nov 17 09:40:29 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 09:40:29 2016 -0500

Merge topic 'cmake-m4-destination'

da0e3f90 install: Configurable DESTINATION for the cmake.m4 file


---

Summary of changes:
 Auxiliary/CMakeLists.txt |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, master, updated. v3.7.0-569-g0e9634d

2016-11-17 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  0e9634d2c90fd748774f9238219cb1661550f233 (commit)
   via  f7c5e970a0b9697ecdb443aecdee87b51e0a5457 (commit)
   via  d95e6dff3cb869d45b27836dc0967ab27872bcdc (commit)
   via  3d42a72bd5827ea875bbba830ecff90b3aaf54d6 (commit)
  from  e67a59b00d08b426272c86771690782e5cc7f97f (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=0e9634d2c90fd748774f9238219cb1661550f233
commit 0e9634d2c90fd748774f9238219cb1661550f233
Merge: e67a59b f7c5e97
Author: Brad King 
AuthorDate: Thu Nov 17 09:40:32 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 09:40:32 2016 -0500

Merge topic 'android-info-variables'

f7c5e970 Android: Add CMAKE__ANDROID_TOOLCHAIN_MACHINE
d95e6dff Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable
3d42a72b Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION


---

Summary of changes:
 Help/manual/cmake-toolchains.7.rst |2 +-
 Help/manual/cmake-variables.7.rst  |2 ++
 Help/release/dev/android-info-variables.rst|   15 +
 .../CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst   |6 
 .../CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.rst|3 ++
 .../CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst   |9 ++
 .../CMAKE_LANG_ANDROID_TOOLCHAIN_PREFIX.rst|3 +-
 .../CMAKE_LANG_ANDROID_TOOLCHAIN_SUFFIX.rst|3 +-
 .../Platform/Android/Determine-Compiler-NDK.cmake  |   17 --
 .../Android/Determine-Compiler-Standalone.cmake|7 
 Modules/Platform/Android/Determine-Compiler.cmake  |7 
 Tests/RunCMake/Android/common.cmake|   34 +++-
 12 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 Help/release/dev/android-info-variables.rst
 create mode 100644 Help/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.rst
 create mode 100644 Help/variable/CMAKE_LANG_ANDROID_TOOLCHAIN_MACHINE.rst


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.7.0-561-g837d135

2016-11-17 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  837d1359ee4d227476154d81de41f4af5ecf2c7c (commit)
   via  451e9f93be4a19f18c4a2ac0a1bd6776ba67c327 (commit)
   via  572ac897733f0b6fe7baf67006db0e8f182db59c (commit)
  from  ab4a9a98266fb29008cecc9649a91fc844c541f5 (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=837d1359ee4d227476154d81de41f4af5ecf2c7c
commit 837d1359ee4d227476154d81de41f4af5ecf2c7c
Merge: ab4a9a9 451e9f9
Author: Brad King 
AuthorDate: Thu Nov 17 09:40:23 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 09:40:23 2016 -0500

Merge topic 'update-kwsys'

451e9f93 Merge branch 'upstream-KWSys' into update-kwsys
572ac897 KWSys 2016-11-16 (a0c60eec)


---

Summary of changes:
 Source/kwsys/SystemInformation.cxx |7 ++-
 Source/kwsys/Terminal.c|2 ++
 2 files changed, 8 insertions(+), 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, master, updated. v3.7.0-563-g8dd3c31

2016-11-17 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  8dd3c319c9baa60459df6b368440d8a7f0857580 (commit)
   via  f0d50957b9c75963222c084c09295e63a45f08f5 (commit)
  from  837d1359ee4d227476154d81de41f4af5ecf2c7c (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=8dd3c319c9baa60459df6b368440d8a7f0857580
commit 8dd3c319c9baa60459df6b368440d8a7f0857580
Merge: 837d135 f0d5095
Author: Brad King 
AuthorDate: Thu Nov 17 09:40:26 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 09:40:26 2016 -0500

Merge topic 'improve_ctest_memcheck_output'

f0d50957 ctest: Improve output for `-T memcheck`


---

Summary of changes:
 Source/CTest/cmCTestMemCheckHandler.cxx|   32 ++--
 .../RunCMake/ctest_memcheck/DummyPurify-stdout.txt |4 ++-
 .../ctest_memcheck/DummyValgrind-stdout.txt|4 ++-
 .../DummyValgrindCustomOptions-stdout.txt  |4 ++-
 .../DummyValgrindFailPost-stdout.txt   |4 ++-
 .../DummyValgrindIgnoreMemcheck-stdout.txt |4 ++-
 .../DummyValgrindNoDefects-stdout.txt  |4 ++-
 .../ctest_memcheck/DummyValgrindPrePost-stdout.txt |4 ++-
 8 files changed, 43 insertions(+), 17 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.7.0-1227-gdb48adf

2016-11-17 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  db48adff5a6075554e2cd681bb0d4a5414af6e38 (commit)
   via  f0d50957b9c75963222c084c09295e63a45f08f5 (commit)
  from  a5749ae9dc21d58857ac856bcde421c6bb3e98b6 (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=db48adff5a6075554e2cd681bb0d4a5414af6e38
commit db48adff5a6075554e2cd681bb0d4a5414af6e38
Merge: a5749ae f0d5095
Author: Brad King 
AuthorDate: Thu Nov 17 09:38:19 2016 -0500
Commit: CMake Topic Stage 
CommitDate: Thu Nov 17 09:38:19 2016 -0500

Merge topic 'improve_ctest_memcheck_output' into next

f0d50957 ctest: Improve output for `-T memcheck`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0d50957b9c75963222c084c09295e63a45f08f5
commit f0d50957b9c75963222c084c09295e63a45f08f5
Author: Bill Hoffman 
AuthorDate: Wed Nov 9 17:30:27 2016 -0500
Commit: Brad King 
CommitDate: Thu Nov 17 09:38:06 2016 -0500

ctest: Improve output for `-T memcheck`

Show how many defects each test that had a defect produced.
Also tell the user where to find the full log files.

diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx 
b/Source/CTest/cmCTestMemCheckHandler.cxx
index 0f27fac..2c31f60 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -329,10 +329,8 @@ void 
cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml)
   }
   xml.EndElement(); // TestList
   cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
- "-- Processing memory checking output: ", this->Quiet);
+ "-- Processing memory checking output:\n", this->Quiet);
   size_t total = this->TestResults.size();
-  size_t step = total / 10;
-  size_t current = 0;
   for (cc = 0; cc < this->TestResults.size(); cc++) {
 cmCTestTestResult* result = >TestResults[cc];
 std::string memcheckstr;
@@ -347,18 +345,29 @@ void 
cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml)
   static_cast(this->CustomMaximumFailedTestOutputSize));
 this->WriteTestResultHeader(xml, result);
 xml.StartElement("Results");
+int memoryErrors = 0;
 for (std::vector::size_type kk = 0; kk < memcheckresults.size();
  ++kk) {
   if (memcheckresults[kk]) {
 xml.StartElement("Defect");
 xml.Attribute("type", this->ResultStringsLong[kk]);
 xml.Content(memcheckresults[kk]);
+memoryErrors += memcheckresults[kk];
 xml.EndElement(); // Defect
   }
   this->GlobalResults[kk] += memcheckresults[kk];
 }
 xml.EndElement(); // Results
-
+if (memoryErrors > 0) {
+  const int maxTestNameWidth = this->CTest->GetMaxTestNameWidth();
+  std::string outname = result->Name + " ";
+  outname.resize(maxTestNameWidth + 4, '.');
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, cc + 1
+   << "/" << total << " MemCheck: #"
+   << result->TestCount << ": " << outname
+   << "   Defects: " << memoryErrors << std::endl,
+ this->Quiet);
+}
 xml.StartElement("Log");
 if (this->CTest->ShouldCompressTestOutput()) {
   this->CTest->CompressString(memcheckstr);
@@ -369,13 +378,16 @@ void 
cmCTestMemCheckHandler::GenerateDartOutput(cmXMLWriter& xml)
 xml.EndElement(); // Log
 
 this->WriteTestResultFooter(xml, result);
-if (current < cc) {
-  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, "#" << std::flush,
- this->Quiet);
-  current += step;
-}
   }
-  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, std::endl, this->Quiet);
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
+ "MemCheck log files can be found here: "
+ "( * corresponds to test number)"
+   << std::endl,
+ this->Quiet);
+  std::string output = this->MemoryTesterOutputFile;
+  cmSystemTools::ReplaceString(output, "??", "*");
+  cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT, output << std::endl,
+ this->Quiet);
   cmCTestOptionalLog(this->CTest, HANDLER_OUTPUT,
  "Memory checking results:" << std::endl, this->Quiet);
   xml.StartElement("DefectList");
diff --git a/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt 
b/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt
index dabb004..69ab584 100644
--- a/Tests/RunCMake/ctest_memcheck/DummyPurify-stdout.txt
+++