[Cmake-commits] CMake branch, next, updated. v3.3.0-1666-gb4bb775

2015-07-31 Thread Stephen Kelly 
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  b4bb7753d5094346c64cb45cfb315d1e93f12dcb (commit)
   via  e2d702941ae6ced5e094182d933d8d12721bc7ac (commit)
   via  aba6d41ba00b9ecd397ed76bb97a4b1780c0a959 (commit)
   via  0815f476a47898cbb967ac684960a68dcc64ead7 (commit)
   via  f6feed2c6d8fedb888a7b1fbb66d870c645c2251 (commit)
  from  0b2500ebacc92f00ea4adc2bc55a5bc0ced4 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b4bb7753d5094346c64cb45cfb315d1e93f12dcb
commit b4bb7753d5094346c64cb45cfb315d1e93f12dcb
Merge: 0b2500e e2d7029
Author: Stephen Kelly 
AuthorDate: Sat Aug 1 02:18:37 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Aug 1 02:18:37 2015 -0400

Merge topic 'use-generator-target' into next

e2d70294 cmMakefile: Remove unused method.
aba6d41b Remove unneeded.
0815f476 cmGlobalGenerator: Base exclusion computation on cmGeneratorTarget.
f6feed2c cmExportInstallFileGenerator: Simplify local generator access.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e2d702941ae6ced5e094182d933d8d12721bc7ac
commit e2d702941ae6ced5e094182d933d8d12721bc7ac
Author: Stephen Kelly 
AuthorDate: Sat Jun 6 14:27:52 2015 +0200
Commit: Stephen Kelly 
CommitDate: Sat Aug 1 08:17:57 2015 +0200

cmMakefile: Remove unused method.

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 1e5c301..00d4005 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -113,10 +113,6 @@ public:
 
   bool GetIsSourceFileTryCompile() const;
 
-  ///! Get the current makefile generator.
-  cmLocalGenerator* GetLocalGenerator() const
-{ return this->LocalGenerator;}
-
   /**
* Help enforce global target name uniqueness.
*/

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aba6d41ba00b9ecd397ed76bb97a4b1780c0a959
commit aba6d41ba00b9ecd397ed76bb97a4b1780c0a959
Author: Stephen Kelly 
AuthorDate: Sat Aug 1 08:17:27 2015 +0200
Commit: Stephen Kelly 
CommitDate: Sat Aug 1 08:17:57 2015 +0200

Remove unneeded.

diff --git a/Source/cmExportInstallFileGenerator.cxx 
b/Source/cmExportInstallFileGenerator.cxx
index f6d7168..d55be11 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -193,7 +193,7 @@ bool 
cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 
 this->PopulateInterfaceProperty("INTERFACE_POSITION_INDEPENDENT_CODE",
   te, properties);
-cmGeneratorTarget *gtgt = te->GetMakefile()->GetLocalGenerator()
+cmGeneratorTarget *gtgt = te->GetMakefile()
 ->GetGlobalGenerator()
 ->GetGeneratorTarget(te);
 
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 45812c7..c831704 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -1199,7 +1199,7 @@ public:
   : Preference(0), Target(target)
 {
 this->Makefile = this->Target->Makefile;
-this->GG = this->Makefile->GetLocalGenerator()->GetGlobalGenerator();
+this->GG = this->Makefile->GetGlobalGenerator();
 }
   void Consider(const char* lang)
 {
diff --git a/Source/cmInstallTargetGenerator.cxx 
b/Source/cmInstallTargetGenerator.cxx
index 60fadbe..30cf175 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -372,7 +372,7 @@ cmInstallTargetGenerator::GetInstallFilename(cmTarget 
const* target,
 {
   std::string fname;
   // Compute the name of the library.
-  cmGeneratorTarget *gtgt = target->GetMakefile()->GetLocalGenerator()
+  cmGeneratorTarget *gtgt = target->GetMakefile()
   ->GetGlobalGenerator()
   ->GetGeneratorTarget(target);
   if(target->GetType() == cmTarget::EXECUTABLE)
@@ -577,7 +577,6 @@ cmInstallTargetGenerator
 }
 
   cmGeneratorTarget *gtgt = tgt->GetMakefile()
-  ->GetLocalGenerator()
   ->GetGlobalGenerator()
   ->GetGeneratorTarget(tgt);
   // If the build tree and install tree use different path
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 30ddb59..f1ba2f4 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -547,7 +547,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget 
const* target)
 {
 qtVersion = makefile->GetDefinition("QT_VERSION_MAJOR");
 }
-  cmGeneratorTarget *gtgt = target->GetMakefile()->G

[Cmake-commits] CMake branch, next, updated. v3.3.0-1661-g0b2500e

2015-07-31 Thread Stephen Kelly 
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  0b2500ebacc92f00ea4adc2bc55a5bc0ced4 (commit)
   via  3492f289d900d8a785270455cdbdd0b49a6490a9 (commit)
  from  db70a1c79decc497a0c42ee543d57dfc53ae8000 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b2500ebacc92f00ea4adc2bc55a5bc0ced4
commit 0b2500ebacc92f00ea4adc2bc55a5bc0ced4
Merge: db70a1c 3492f28
Author: Stephen Kelly 
AuthorDate: Sat Aug 1 02:00:37 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Aug 1 02:00:37 2015 -0400

Merge topic 'cmState-policies' into next

3492f289 cmState: Move PolicyState from cmMakefile.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3492f289d900d8a785270455cdbdd0b49a6490a9
commit 3492f289d900d8a785270455cdbdd0b49a6490a9
Author: Stephen Kelly 
AuthorDate: Sun Jul 26 13:04:09 2015 +0200
Commit: Stephen Kelly 
CommitDate: Sat Aug 1 08:00:27 2015 +0200

cmState: Move PolicyState from cmMakefile.

Implement lexical scope checking in terms of the state stack instead
of barriers.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9fb3d06..a0a36ec 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -192,9 +192,6 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
   this->StateSnapshot = this->StateSnapshot.GetState()
   ->CreatePolicyScopeSnapshot(this->StateSnapshot);
 
-  // Protect the directory-level policies.
-  this->PushPolicyBarrier();
-
   // Enter a policy level for this directory.
   this->PushPolicy();
 
@@ -239,11 +236,6 @@ cmMakefile::~cmMakefile()
   cmDeleteAll(this->FinalPassCommands);
   cmDeleteAll(this->FunctionBlockers);
   this->FunctionBlockers.clear();
-  if (this->PolicyStack.size() != 1)
-  {
-cmSystemTools::Error("Internal CMake Error, Policy Stack has not been"
-  " popped properly");
-  }
 }
 
 //
@@ -479,7 +471,6 @@ cmMakefile::IncludeScope::IncludeScope(cmMakefile* mf,
 this->Makefile->ContextStack.back()->Name,
 this->Makefile->ContextStack.back()->Line,
 filenametoread);
-  this->Makefile->PushPolicyBarrier();
   if(!this->NoPolicyScope)
 {
 // Check CMP0011 to determine the policy scope type.
@@ -519,7 +510,8 @@ cmMakefile::IncludeScope::~IncludeScope()
 // one we pushed above.  If the entry is empty, then the included
 // script did not set any policies that might affect the includer so
 // we do not need to enforce the policy.
-if(this->CheckCMP0011 && this->Makefile->PolicyStack.back().IsEmpty())
+if(this->CheckCMP0011
+   && !this->Makefile->StateSnapshot.HasDefinedPolicyCMP0011())
   {
   this->CheckCMP0011 = false;
   }
@@ -535,9 +527,6 @@ cmMakefile::IncludeScope::~IncludeScope()
   }
 }
   this->Makefile->PopPolicyBarrier(this->ReportError);
-  this->Makefile->StateSnapshot =
-  this->Makefile->GetState()->Pop(this->Makefile->StateSnapshot);
-  assert(this->Makefile->StateSnapshot.IsValid());
 
   this->Makefile->PopFunctionBlockerBarrier(this->ReportError);
 }
@@ -646,19 +635,12 @@ public:
   this->Makefile->StateSnapshot, name, line, filenametoread);
 assert(this->Makefile->StateSnapshot.IsValid());
 
-this->Makefile->PushPolicyBarrier();
-
 this->Makefile->PushFunctionBlockerBarrier();
   }
 
   ~ListFileScope()
   {
 this->Makefile->PopPolicyBarrier(this->ReportError);
-
-this->Makefile->StateSnapshot =
-this->Makefile->GetState()->Pop(this->Makefile->StateSnapshot);
-assert(this->Makefile->StateSnapshot.IsValid());
-
 this->Makefile->PopFunctionBlockerBarrier(this->ReportError);
   }
 
@@ -1630,7 +1612,6 @@ void cmMakefile::PushFunctionScope(std::string const& 
fileName,
 this->ContextStack.back()->Name, this->ContextStack.back()->Line,
 fileName);
   assert(this->StateSnapshot.IsValid());
-  this->PushPolicyBarrier();
 
   this->Internal->PushDefinitions();
 
@@ -1650,8 +1631,6 @@ void cmMakefile::PopFunctionScope(bool reportError)
   this->PopPolicy();
 
   this->PopPolicyBarrier(reportError);
-  this->StateSnapshot = this->GetState()->Pop(this->StateSnapshot);
-  assert(this->StateSnapshot.IsValid());
 
   this->PopFunctionBlockerBarrier(reportError);
 
@@ -1675,7 +1654,6 @@ void cmMakefile::PushMacroScope(std::string const& 
fileName,
 this->ContextStack.back()->Name, this->ContextStack.back()->Line,
 fileName);
   assert(this->StateSnapshot.IsValid());
-  this->PushPolicyBarrier();
 
   this->PushFunctionBlockerBarrier();
 
@@ -168

[Cmake-commits] CMake branch, next, updated. v3.3.0-1659-gdb70a1c

2015-07-31 Thread Stephen Kelly 
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  db70a1c79decc497a0c42ee543d57dfc53ae8000 (commit)
   via  93f0c176d8abd604902c8ecafa41b4b4a1a9b12b (commit)
  from  1aa0ee9cc3514467d66832d127aa955a99fb (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db70a1c79decc497a0c42ee543d57dfc53ae8000
commit db70a1c79decc497a0c42ee543d57dfc53ae8000
Merge: 1aa 93f0c17
Author: Stephen Kelly 
AuthorDate: Sat Aug 1 02:00:12 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Aug 1 02:00:12 2015 -0400

Merge topic 'cmState-policies' into next

93f0c176 simplify


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93f0c176d8abd604902c8ecafa41b4b4a1a9b12b
commit 93f0c176d8abd604902c8ecafa41b4b4a1a9b12b
Author: Stephen Kelly 
AuthorDate: Sat Aug 1 07:59:38 2015 +0200
Commit: Stephen Kelly 
CommitDate: Sat Aug 1 07:59:55 2015 +0200

simplify

diff --git a/Source/cmState.cxx b/Source/cmState.cxx
index 492a4d0..f425861 100644
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@ -1060,9 +1060,7 @@ bool cmState::Snapshot::PopPolicy()
 
 bool cmState::Snapshot::CanPopPolicyScope()
 {
-  PositionType pos = this->Position;
-  bool ok = (pos->Policies == pos->PolicyScope);
-  return ok;
+  return this->Position->Policies == this->Position->PolicyScope;
 }
 
 void cmState::Snapshot::SetPolicy(cmPolicies::PolicyID id,

---

Summary of changes:
 Source/cmState.cxx |4 +---
 1 file changed, 1 insertion(+), 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.3.0-1657-g1aa0000

2015-07-31 Thread Stephen Kelly 
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  1aa0ee9cc3514467d66832d127aa955a99fb (commit)
   via  adce5f39a42fa780c07e23c2a89d6ec47f66331c (commit)
   via  8572cce92cb678eba225161478fbb8dff3bc15ee (commit)
   via  f95a1e6ebae47a3d2897d82f4485d1faf94bcb09 (commit)
   via  5fb814d7f968e10a6a02e2a78b7dccb7c34b026b (commit)
   via  af0de01c6b3395fb1dba5d2ee0a94c19a9b464e9 (commit)
   via  6ae8b30bf4127011284a66541ed2116fcb45f007 (commit)
   via  a5fc17b5098ee27fd7ae457ca6c5743bacc384a7 (commit)
   via  0a01e6c6e7bd428ca0ec99a00924b5b498c6e637 (commit)
   via  f0005bb484bc2b85a169ef7816e33d8e2f16e109 (commit)
  from  383ae666d2bfad26165c87c9edfebea52c82119e (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1aa0ee9cc3514467d66832d127aa955a99fb
commit 1aa0ee9cc3514467d66832d127aa955a99fb
Merge: 383ae66 adce5f3
Author: Stephen Kelly 
AuthorDate: Sat Aug 1 01:54:15 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Sat Aug 1 01:54:15 2015 -0400

Merge topic 'cmState-policies' into next

adce5f39 cmState: Move PolicyState from cmMakefile.
8572cce9 cmState: Record the end position of each directory.
f95a1e6e cmLinkedTree: Add Clear API.
5fb814d7 cmState: Add Type for policy scope.
af0de01c cmState: Remove call stack parent tracking.
6ae8b30b cmMakefile: Move policy barriers inside cmState scopes.
a5fc17b5 cmMakefile: Re-order policy entries and barriers.
0a01e6c6 cmState: Add Snapshot Type accessor.
f0005bb4 Tests: Verify generate-time policy scope behavior.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adce5f39a42fa780c07e23c2a89d6ec47f66331c
commit adce5f39a42fa780c07e23c2a89d6ec47f66331c
Author: Stephen Kelly 
AuthorDate: Sun Jul 26 13:04:09 2015 +0200
Commit: Stephen Kelly 
CommitDate: Sat Aug 1 07:53:35 2015 +0200

cmState: Move PolicyState from cmMakefile.

Implement lexical scope checking in terms of the state stack instead
of barriers.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9fb3d06..a0a36ec 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -192,9 +192,6 @@ cmMakefile::cmMakefile(cmLocalGenerator* localGenerator)
   this->StateSnapshot = this->StateSnapshot.GetState()
   ->CreatePolicyScopeSnapshot(this->StateSnapshot);
 
-  // Protect the directory-level policies.
-  this->PushPolicyBarrier();
-
   // Enter a policy level for this directory.
   this->PushPolicy();
 
@@ -239,11 +236,6 @@ cmMakefile::~cmMakefile()
   cmDeleteAll(this->FinalPassCommands);
   cmDeleteAll(this->FunctionBlockers);
   this->FunctionBlockers.clear();
-  if (this->PolicyStack.size() != 1)
-  {
-cmSystemTools::Error("Internal CMake Error, Policy Stack has not been"
-  " popped properly");
-  }
 }
 
 //
@@ -479,7 +471,6 @@ cmMakefile::IncludeScope::IncludeScope(cmMakefile* mf,
 this->Makefile->ContextStack.back()->Name,
 this->Makefile->ContextStack.back()->Line,
 filenametoread);
-  this->Makefile->PushPolicyBarrier();
   if(!this->NoPolicyScope)
 {
 // Check CMP0011 to determine the policy scope type.
@@ -519,7 +510,8 @@ cmMakefile::IncludeScope::~IncludeScope()
 // one we pushed above.  If the entry is empty, then the included
 // script did not set any policies that might affect the includer so
 // we do not need to enforce the policy.
-if(this->CheckCMP0011 && this->Makefile->PolicyStack.back().IsEmpty())
+if(this->CheckCMP0011
+   && !this->Makefile->StateSnapshot.HasDefinedPolicyCMP0011())
   {
   this->CheckCMP0011 = false;
   }
@@ -535,9 +527,6 @@ cmMakefile::IncludeScope::~IncludeScope()
   }
 }
   this->Makefile->PopPolicyBarrier(this->ReportError);
-  this->Makefile->StateSnapshot =
-  this->Makefile->GetState()->Pop(this->Makefile->StateSnapshot);
-  assert(this->Makefile->StateSnapshot.IsValid());
 
   this->Makefile->PopFunctionBlockerBarrier(this->ReportError);
 }
@@ -646,19 +635,12 @@ public:
   this->Makefile->StateSnapshot, name, line, filenametoread);
 assert(this->Makefile->StateSnapshot.IsValid());
 
-this->Makefile->PushPolicyBarrier();
-
 this->Makefile->PushFunctionBlockerBarrier();
   }
 
   ~ListFileScope()
   {
 this->Makefile->PopPolicyBarrier(this->ReportError);
-
-this->Makefile->StateSnapshot =
-this->Makefile->GetState()->Pop(this->Makefile->StateSnapshot);
-assert(this->Makefile->StateSnapshot.IsValid());
-
 this->Makefil

[Cmake-commits] CMake branch, master, updated. v3.3.0-660-g9432b14

2015-07-31 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  9432b14e916421a727265f9a05dc1fbe6c6ec381 (commit)
  from  6c3d0e9a6bf88a03442acf1f0bc1ef1575779d46 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9432b14e916421a727265f9a05dc1fbe6c6ec381
commit 9432b14e916421a727265f9a05dc1fbe6c6ec381
Author: Kitware Robot 
AuthorDate: Sat Aug 1 00:01:06 2015 -0400
Commit: Kitware Robot 
CommitDate: Sat Aug 1 00:01:06 2015 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 34779a5..5d53072 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 3)
-set(CMake_VERSION_PATCH 20150731)
+set(CMake_VERSION_PATCH 20150801)
 #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.3.0-1611-g967364d

2015-07-31 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  967364dea4fb2a13bfe22f73d8343bccf15d3883 (commit)
   via  5d0a8b1abc3f8a6d8d23772251b4ef2758d2def6 (commit)
   via  afb674ab46a7d6ff3d1801315f3d852bdba79d0c (commit)
   via  1c46b6aed0db88c97189713f291164f98df780a9 (commit)
  from  fb65bd6b653a30e83faf97c73e0de1961f6e5c7e (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=967364dea4fb2a13bfe22f73d8343bccf15d3883
commit 967364dea4fb2a13bfe22f73d8343bccf15d3883
Merge: fb65bd6 5d0a8b1
Author: Brad King 
AuthorDate: Fri Jul 31 09:50:45 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:50:45 2015 -0400

Merge topic 'GetPrerequisites-updates' into next

5d0a8b1a GetPrerequisites: Optionally filter "objdump" output for speed
afb674ab GetPrerequisites: Add error checks for execute_process() calls
1c46b6ae FindMPI: Drop unnecessary and incorrect use of GetPrerequisites


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d0a8b1abc3f8a6d8d23772251b4ef2758d2def6
commit 5d0a8b1abc3f8a6d8d23772251b4ef2758d2def6
Author: Bill Somerville 
AuthorDate: Wed Jul 29 17:36:38 2015 +0100
Commit: Brad King 
CommitDate: Fri Jul 31 09:50:32 2015 -0400

GetPrerequisites: Optionally filter "objdump" output for speed

As dumpbin.exe is no longer reliable for gcc libraries on MinGW because
it crashes on many common libraries like libgcc_s and libgfortran it is
now necessary too resort to using objdump for DLL dependency walking.
Using objdump has a secondary problem in that it generates a lot of
output for large libraries and causes fixup_bundle() to take many
minutes to process what took fractions of a second with
"dumpbin.exe /dependents".

Add a 'grep' pre-filter in the execute_process() command pipeline to
reduce this output to a minimum for a several orders of magnitude speed
up.  If grep is not available just use the full output.

As there does not seem to be a reliable way of detecting MinGW, callers
of fixup_bundle() may have to set the variable gp_tool to "objdump" if
dumpbin.exe is installed on the build machine to stop it using the
broken MS dumpbin.exe for library dependency walking.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index a359d2c..e4018b6 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -700,6 +700,8 @@ function(get_prerequisites target prerequisites_var 
exclude_system recurse exepa
 return()
   endif()
 
+  set(gp_cmd_maybe_filter)  # optional command to pre-filter gp_tool 
results
+
   if(gp_tool STREQUAL "ldd")
 set(gp_cmd_args "")
 set(gp_regex "^[\t ]*[^\t ]+ => ([^\t\(]+) .*${eol_char}$")
@@ -724,6 +726,11 @@ function(get_prerequisites target prerequisites_var 
exclude_system recurse exepa
 set(gp_regex_error "")
 set(gp_regex_fallback "")
 set(gp_regex_cmp_count 1)
+# objdump generaates copious output so we create a grep filter to 
pre-filter results
+find_program(gp_grep_cmd grep)
+if(gp_grep_cmd)
+  set(gp_cmd_maybe_filter COMMAND ${gp_grep_cmd} "^[[:blank:]]*DLL Name: ")
+endif()
   else()
 message(STATUS "warning: gp_tool='${gp_tool}' is an unknown tool...")
 message(STATUS "CMake function get_prerequisites needs more code to handle 
'${gp_tool}'")
@@ -780,6 +787,7 @@ function(get_prerequisites target prerequisites_var 
exclude_system recurse exepa
   #
   execute_process(
 COMMAND ${gp_cmd} ${gp_cmd_args} ${target}
+${gp_cmd_maybe_filter}
 RESULT_VARIABLE gp_rv
 OUTPUT_VARIABLE gp_cmd_ov
 ERROR_VARIABLE gp_ev

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afb674ab46a7d6ff3d1801315f3d852bdba79d0c
commit afb674ab46a7d6ff3d1801315f3d852bdba79d0c
Author: Bill Somerville 
AuthorDate: Wed Jul 29 17:05:51 2015 +0100
Commit: Brad King 
CommitDate: Fri Jul 31 09:50:32 2015 -0400

GetPrerequisites: Add error checks for execute_process() calls

Add return status checks to external command invocations so that they do
not fail silently producing incomplete install packages.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index 23d486e..a359d2c 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -229,9 +229,14 @@ function(is_file_executable file result_var)
 
 if(file_cmd)
   execute_process(COMMAND "${file_cmd}" "${file_full}"
+RESULT_VARIABLE file_rv
 OUTPUT_VARIABLE file_ov
+ERROR_VARIABLE file_ev
 OUTPUT_STRIP_

[Cmake-commits] CMake branch, next, updated. v3.3.0-1607-gfb65bd6

2015-07-31 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  fb65bd6b653a30e83faf97c73e0de1961f6e5c7e (commit)
   via  6d6d147685f57d578a1859de7202fa776bdeba72 (commit)
  from  3394db5b8debc195eae4275ae1e9c8e74611d422 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb65bd6b653a30e83faf97c73e0de1961f6e5c7e
commit fb65bd6b653a30e83faf97c73e0de1961f6e5c7e
Merge: 3394db5 6d6d147
Author: Brad King 
AuthorDate: Fri Jul 31 09:50:09 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:50:09 2015 -0400

Merge topic 'GetPrerequisites-updates' into next

6d6d1476 FindMPI: Drop unnecessary and incorrect use of GetPrerequisites


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d6d147685f57d578a1859de7202fa776bdeba72
commit 6d6d147685f57d578a1859de7202fa776bdeba72
Author: Brad King 
AuthorDate: Fri Jul 31 09:42:25 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:49:15 2015 -0400

FindMPI: Drop unnecessary and incorrect use of GetPrerequisites

Since commit v2.8.5~121^2~2 (FindMPI: Handle multiple languages,
2010-12-29) we called the GetPrerequisites is_file_executable function
but passed the name of a CMake variable instead of its value.  Therefore
the function has always failed and caused the search for the compiler
name to run even with an absolute path.  Switch to using if(IS_ABSOLUTE)
instead and drop use of GetPrerequisites.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 06ecfaa..48adf3c 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -102,7 +102,6 @@
 
 # include this to handle the QUIETLY and REQUIRED arguments
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/GetPrerequisites.cmake)
 
 #
 # This part detects MPI compilers, attempting to wade through the mess of 
compiler names in
@@ -578,14 +577,13 @@ foreach (lang C CXX Fortran)
   if (CMAKE_${lang}_COMPILER_WORKS)
 # If the user supplies a compiler *name* instead of an absolute path, 
assume that we need to find THAT compiler.
 if (MPI_${lang}_COMPILER)
-  is_file_executable(MPI_${lang}_COMPILER MPI_COMPILER_IS_EXECUTABLE)
-  if (NOT MPI_COMPILER_IS_EXECUTABLE)
+  if (NOT IS_ABSOLUTE "${MPI_${lang}_COMPILER}")
 # Get rid of our default list of names and just search for the name 
the user wants.
 set(_MPI_${lang}_COMPILER_NAMES ${MPI_${lang}_COMPILER})
 set(MPI_${lang}_COMPILER "MPI_${lang}_COMPILER-NOTFOUND" CACHE 
FILEPATH "Cleared" FORCE)
-# If the user specifies a compiler, we don't want to try to search 
libraries either.
-set(try_libs FALSE)
   endif()
+  # If the user specifies a compiler, we don't want to try to search 
libraries either.
+  set(try_libs FALSE)
 else()
   set(try_libs TRUE)
 endif()

---

Summary of changes:
 Modules/FindMPI.cmake |8 +++-
 1 file changed, 3 insertions(+), 5 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.3.0-1600-g7899f69

2015-07-31 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  7899f6955a3e4782db656c46390087f4c8a8e205 (commit)
   via  a9aa0cb7ff9fa14ab7e4798fa2a373e26190f51c (commit)
  from  199ea5b65360275f0bc489dff1ddbefc064cd271 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7899f6955a3e4782db656c46390087f4c8a8e205
commit 7899f6955a3e4782db656c46390087f4c8a8e205
Merge: 199ea5b a9aa0cb
Author: Brad King 
AuthorDate: Fri Jul 31 09:28:48 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:28:48 2015 -0400

Merge topic 'update-kwsys' into next

a9aa0cb7 Revise topic 'update-kwsys'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9aa0cb7ff9fa14ab7e4798fa2a373e26190f51c
commit a9aa0cb7ff9fa14ab7e4798fa2a373e26190f51c
Author: Brad King 
AuthorDate: Fri Jul 31 09:28:21 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:28:21 2015 -0400

Revise topic 'update-kwsys'

Make it look like the head of an upcoming rewrite of the topic.

diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake
index 663e7af..bdbb79b 100644
--- a/Modules/FindHg.cmake
+++ b/Modules/FindHg.cmake
@@ -81,9 +81,6 @@ if(HG_EXECUTABLE)
   if(hg_result MATCHES "is not a valid Win32 application")
 set_property(CACHE HG_EXECUTABLE PROPERTY VALUE "HG_EXECUTABLE-NOTFOUND")
   endif()
-  if(hg_result MATCHES "The handle is invalid")
-set_property(CACHE HG_EXECUTABLE PROPERTY VALUE "HG_EXECUTABLE-NOTFOUND")
-  endif()
   if(hg_version MATCHES "^Mercurial Distributed SCM \\(version 
([0-9][^)]*)\\)")
 set(HG_VERSION_STRING "${CMAKE_MATCH_1}")
   endif()
diff --git a/Source/kwsys/ProcessWin32.c b/Source/kwsys/ProcessWin32.c
index ba3397c..1f8749f 100644
--- a/Source/kwsys/ProcessWin32.c
+++ b/Source/kwsys/ProcessWin32.c
@@ -109,14 +109,15 @@ static DWORD WINAPI kwsysProcessPipeThreadWake(LPVOID 
ptd);
 static void kwsysProcessPipeThreadWakePipe(kwsysProcess* cp,
kwsysProcessPipeData* td);
 static int kwsysProcessInitialize(kwsysProcess* cp);
-static int kwsysProcessCreate(kwsysProcess* cp, int index,
-  kwsysProcessCreateInformation* si);
+static DWORD kwsysProcessCreate(kwsysProcess* cp, int index,
+kwsysProcessCreateInformation* si);
 static void kwsysProcessDestroy(kwsysProcess* cp, int event);
-static int kwsysProcessSetupOutputPipeFile(PHANDLE handle, const char* name);
+static DWORD kwsysProcessSetupOutputPipeFile(PHANDLE handle,
+ const char* name);
 static void kwsysProcessSetupSharedPipe(DWORD nStdHandle, PHANDLE handle);
 static void kwsysProcessSetupPipeNative(HANDLE native, PHANDLE handle);
 static void kwsysProcessCleanupHandle(PHANDLE h);
-static void kwsysProcessCleanup(kwsysProcess* cp, int error);
+static void kwsysProcessCleanup(kwsysProcess* cp, DWORD error);
 static void kwsysProcessCleanErrorMessage(kwsysProcess* cp);
 static int kwsysProcessGetTimeoutTime(kwsysProcess* cp, double* userTimeout,
   kwsysProcessTime* timeoutTime);
@@ -969,7 +970,7 @@ void kwsysProcess_Execute(kwsysProcess* cp)
 if(!GetCurrentDirectoryW(cp->RealWorkingDirectoryLength,
 cp->RealWorkingDirectory))
   {
-  kwsysProcessCleanup(cp, 1);
+  kwsysProcessCleanup(cp, GetLastError());
   return;
   }
 SetCurrentDirectoryW(cp->WorkingDirectory);
@@ -981,14 +982,16 @@ void kwsysProcess_Execute(kwsysProcess* cp)
 {
 /* Create a handle to read a file for stdin.  */
 wchar_t* wstdin = kwsysEncoding_DupToWide(cp->PipeFileSTDIN);
+DWORD error;
 cp->PipeChildStd[0] =
   CreateFileW(wstdin, GENERIC_READ|GENERIC_WRITE,
   FILE_SHARE_READ|FILE_SHARE_WRITE,
   0, OPEN_EXISTING, 0, 0);
+error = GetLastError(); /* Check now in case free changes this.  */
 free(wstdin);
 if(cp->PipeChildStd[0] == INVALID_HANDLE_VALUE)
   {
-  kwsysProcessCleanup(cp, 1);
+  kwsysProcessCleanup(cp, error);
   return;
   }
 }
@@ -1014,17 +1017,18 @@ void kwsysProcess_Execute(kwsysProcess* cp)
   if(!CreatePipe(&cp->Pipe[KWSYSPE_PIPE_STDOUT].Read,
  &cp->Pipe[KWSYSPE_PIPE_STDOUT].Write, 0, 0))
 {
-kwsysProcessCleanup(cp, 1);
+kwsysProcessCleanup(cp, GetLastError());
 return;
 }
 
   if(cp->PipeFileSTDOUT)
 {
 /* Use a file for stdout.  */
-if(!kwsysProcessSetupOutputPipeFile(&cp->PipeChildStd[1],
-cp->PipeFileSTDOUT))
+DWORD erro

[Cmake-commits] CMake branch, next, updated. v3.3.0-1605-g3394db5

2015-07-31 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  3394db5b8debc195eae4275ae1e9c8e74611d422 (commit)
   via  da98b89612d59906bd938d58a9072b3ce68864de (commit)
   via  129640f279259e51fbb0e81a5bec2ec2dfac543e (commit)
   via  d0915bc86f294707411ae525e70fa20965f1aeec (commit)
   via  1feafc643b1c50fd0fa8171a4170065ca39d4d4c (commit)
  from  7899f6955a3e4782db656c46390087f4c8a8e205 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3394db5b8debc195eae4275ae1e9c8e74611d422
commit 3394db5b8debc195eae4275ae1e9c8e74611d422
Merge: 7899f69 da98b89
Author: Brad King 
AuthorDate: Fri Jul 31 09:29:18 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:29:18 2015 -0400

Merge topic 'update-kwsys' into next

da98b896 Tests: In CTestTest2 skip the kwsys.testProcess-10 test that leaks
129640f2 CTestCustom: Ignore kwsys.testProcess-10 for MemCheck as KWSys does
d0915bc8 Merge branch 'upstream-kwsys' into update-kwsys
1feafc64 KWSys 2015-07-30 (f63febb7)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da98b89612d59906bd938d58a9072b3ce68864de
commit da98b89612d59906bd938d58a9072b3ce68864de
Author: Brad King 
AuthorDate: Thu Jul 23 09:47:03 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:27:08 2015 -0400

Tests: In CTestTest2 skip the kwsys.testProcess-10 test that leaks

This test intentionally leaks memory so KWSys excludes it from MemCheck.
However, when CTestTest2 runs under our own MemCheck then valgrind may
recursively check tests run by ctest_test() calls in our test.cmake
script.  Teach these calls to exluce testProcess-10 too.  Also read
the KWSys CTestCustom.cmake file so ctest_memcheck() will ignore the
test too.

diff --git a/Tests/CTestTest2/test.cmake.in b/Tests/CTestTest2/test.cmake.in
index 852bb6b..825b957 100644
--- a/Tests/CTestTest2/test.cmake.in
+++ b/Tests/CTestTest2/test.cmake.in
@@ -39,14 +39,19 @@ CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
 CTEST_TEST_KWSYS:BOOL=ON
 ")
 
+set(test_exclude
+  kwsys.testProcess-10
+  )
+
 CTEST_START(Experimental)
 #CTEST_UPDATE(SOURCE "${CTEST_SOURCE_DIRECTORY}" RETURN_VALUE res)
 CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+CTEST_READ_CUSTOM_FILES(${CTEST_BINARY_DIRECTORY})
 CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res START 1 END 5 
STRIDE 2)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res START 7 STRIDE 2 
SUBMIT_INDEX 1)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res START 2 END 4 
STRIDE 2 SUBMIT_INDEX 2)
-CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res START 6 STRIDE 2 
SUBMIT_INDEX 3)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res EXCLUDE 
${test_exclude} START 1 END 5 STRIDE 2)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res EXCLUDE 
${test_exclude} START 7 STRIDE 2 SUBMIT_INDEX 1)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res EXCLUDE 
${test_exclude} START 2 END 4 STRIDE 2 SUBMIT_INDEX 2)
+CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res EXCLUDE 
${test_exclude} START 6 STRIDE 2 SUBMIT_INDEX 3)
 CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res STRIDE 1.5)
 CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=129640f279259e51fbb0e81a5bec2ec2dfac543e
commit 129640f279259e51fbb0e81a5bec2ec2dfac543e
Author: Brad King 
AuthorDate: Thu Jul 23 09:22:25 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:27:01 2015 -0400

CTestCustom: Ignore kwsys.testProcess-10 for MemCheck as KWSys does

The test covers exceptional behavior that leaks memory, so ignore it for
dynamic analysis runs.

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
index 7f20d10..f29ac70 100644
--- a/CTestCustom.cmake.in
+++ b/CTestCustom.cmake.in
@@ -109,3 +109,7 @@ set(CTEST_CUSTOM_COVERAGE_EXCLUDE
   # Exclude Qt source files from coverage results:
   "[A-Za-z]./[Qq]t/qt-.+-opensource-src"
   )
+
+list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE
+  kwsys.testProcess-10 # See Source/kwsys/CTestCustom.cmake.in
+  )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0915bc86f294707411ae525e70fa20965f1aeec
commit d0915bc86f294707411ae525e70fa20965f1aeec
Merge: 5967803 1feafc6
Author: Brad King 
AuthorDate: Fri Jul 31 09:26:35 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:26:35 2015 -0400

Merge branch 'upstream-kwsys' into update-kwsys

d

[Cmake-commits] CMake branch, next, updated. v3.3.0-1598-g199ea5b

2015-07-31 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  199ea5b65360275f0bc489dff1ddbefc064cd271 (commit)
   via  6c3d0e9a6bf88a03442acf1f0bc1ef1575779d46 (commit)
   via  8515f26a6381e32d8d15064afd030eb1392ce2d8 (commit)
   via  609e8b181a4bf49c5095fff33365606db30e7921 (commit)
   via  82e77d74304707255265a564678b38ea372813dd (commit)
   via  6e11703c6c9526724040f72c48e2f18616290080 (commit)
   via  e91f096e1beba3c3d6f71e5c7cbc337c9d9d7282 (commit)
  from  4413ed800ccfd7adb73eda166442245eb286fe82 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=199ea5b65360275f0bc489dff1ddbefc064cd271
commit 199ea5b65360275f0bc489dff1ddbefc064cd271
Merge: 4413ed8 6c3d0e9
Author: Brad King 
AuthorDate: Fri Jul 31 09:22:05 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:22:05 2015 -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, master, updated. v3.3.0-657-g8515f26

2015-07-31 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  8515f26a6381e32d8d15064afd030eb1392ce2d8 (commit)
   via  fbcbf7f29d630c8a291f0d0e543defbf1b8208df (commit)
   via  4c10461a877d8ca8f18c952c2c143320337d04a7 (commit)
  from  609e8b181a4bf49c5095fff33365606db30e7921 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8515f26a6381e32d8d15064afd030eb1392ce2d8
commit 8515f26a6381e32d8d15064afd030eb1392ce2d8
Merge: 609e8b1 fbcbf7f
Author: Brad King 
AuthorDate: Fri Jul 31 09:21:49 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:21:49 2015 -0400

Merge topic 'FindOpenSSL-cleanup'

fbcbf7f2 FindOpenSSL: De-duplicate find_library path suffixes on Windows
4c10461a FindOpenSSL: Remove extra whitespace


---

Summary of changes:
 Modules/FindOpenSSL.cmake |   41 -
 1 file changed, 20 insertions(+), 21 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.3.0-659-g6c3d0e9

2015-07-31 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  6c3d0e9a6bf88a03442acf1f0bc1ef1575779d46 (commit)
   via  fe2e503ea4abe83ce091bfa2c8cf4d977fba388a (commit)
  from  8515f26a6381e32d8d15064afd030eb1392ce2d8 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c3d0e9a6bf88a03442acf1f0bc1ef1575779d46
commit 6c3d0e9a6bf88a03442acf1f0bc1ef1575779d46
Merge: 8515f26 fe2e503
Author: Brad King 
AuthorDate: Fri Jul 31 09:21:51 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:21:51 2015 -0400

Merge topic 'doc-string-FIND-failure-case'

fe2e503e Help: Document string(FIND) return value when no match is found


---

Summary of changes:
 Help/command/string.rst |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.3.0-652-g82e77d7

2015-07-31 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  82e77d74304707255265a564678b38ea372813dd (commit)
   via  a23fcc9558f9f2788fc828f7473060ea1f035f55 (commit)
   via  4e41913f9acb6a33f6a4eb1b88577fb7499e99d6 (commit)
   via  e5e529701812bdfe7ea1c3ffe682bd576b9c05a8 (commit)
   via  3ef871786b32ed88a29e48dd17d32f5a8a79 (commit)
   via  5f662b3887c3e92adfcad1bc92eabfd86db263b7 (commit)
   via  0368552d7fcdd35a0cb52043a8567e66d62bccd3 (commit)
   via  5edb3354854bd2de4f9ea0e2c4af4069f46a4830 (commit)
   via  ff1019bfac1380681989242fa904c2d9fe13fd38 (commit)
   via  aa2407d84d8bcd983b3df294032831bbd54cf25d (commit)
   via  610572b7d27e122ebf8e5c5d430019844567a996 (commit)
   via  2e94cba3565105aaa23720d9ffdcb9fe1ccee6b9 (commit)
   via  fb9355c50e366bd0f7cb6df6ea19118bd7dae899 (commit)
   via  29e8b7bfcc8b3530fb4fd2dd04dca59744588b61 (commit)
   via  1ef9b2b6007356ab26cdec42bdf9c79d53745bf6 (commit)
   via  5c14f78005ba5b4a2ccf0899fc50805a9de7b9ee (commit)
   via  a1209be550172a95d3254158c121abf184e60bcd (commit)
   via  32e4f6beca6f13165ec5a40bf363d005ebda9263 (commit)
   via  34b902a5a6fd55ef3857d74aab986a8d96d57659 (commit)
   via  aaa322a5cb5603742273282fb12f1e368697a625 (commit)
  from  6e11703c6c9526724040f72c48e2f18616290080 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82e77d74304707255265a564678b38ea372813dd
commit 82e77d74304707255265a564678b38ea372813dd
Merge: 6e11703 a23fcc9
Author: Brad King 
AuthorDate: Fri Jul 31 09:21:45 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:21:45 2015 -0400

Merge topic 'refactor-install'

a23fcc95 cmInstallTargetGenerator: Port to cmGeneratorTarget.
4e41913f cmInstallCommand: Store only a targetName, not a cmTarget.
e5e52970 cmInstallGenerator: Add a Compute() virtual hook.
3ef8 cmInstallCommand: Move the SetHaveInstallRule invocation.
5f662b38 cmScriptGenerator: Remove unused method.
0368552d cmGlobalGenerator: Move QtAutogen handling to Compute().
5edb3354 cmGlobalGenerator: Virtualize the Compute step and override it.
ff1019bf cmGlobalGenerator: Move generation object creation to Compute().
aa2407d8 Xcode: Use allBuild target return value.
610572b7 cmMakefile: Simplify generate-time cmGeneratorTarget creation.
2e94cba3 cmGlobalGenerator: Move FinalizeTargetCompileInfo to Compute().
fb9355c5 cmGlobalGenerator: Return from Compute whether to generate.
29e8b7bf cmGlobalGenerator: Create a new Compute step before generation.
1ef9b2b6 cmGlobalGenerator: Remove the TargetManifest member.
5c14f780 cmGlobalGenerator: Remove unused manifest accessor.
a1209be5 VisualStudio: Skip global targets when processing.
...


---

Summary of changes:
 Source/cmExportInstallFileGenerator.cxx|2 +-
 Source/cmGeneratorTarget.cxx   |   10 ++--
 Source/cmGlobalGenerator.cxx   |   35 +++
 Source/cmGlobalGenerator.h |   16 +
 Source/cmGlobalVisualStudio10Generator.cxx |   11 +++-
 Source/cmGlobalVisualStudio10Generator.h   |2 +
 Source/cmGlobalVisualStudio8Generator.cxx  |   13 ++--
 Source/cmGlobalVisualStudio8Generator.h|2 +-
 Source/cmGlobalVisualStudioGenerator.cxx   |   17 --
 Source/cmGlobalVisualStudioGenerator.h |2 +-
 Source/cmGlobalXCodeGenerator.cxx  |   28 +++--
 Source/cmGlobalXCodeGenerator.h|1 +
 Source/cmInstallCommand.cxx|9 ++-
 Source/cmInstallGenerator.h|2 +
 Source/cmInstallTargetGenerator.cxx|   89 +---
 Source/cmInstallTargetGenerator.h  |   14 +++--
 Source/cmLocalGenerator.cxx|   18 +++---
 Source/cmLocalVisualStudio6Generator.cxx   |3 +-
 Source/cmLocalVisualStudio7Generator.cxx   |4 ++
 Source/cmMakefile.cxx  |   29 +
 Source/cmMakefile.h|   22 ---
 Source/cmQtAutoGenerators.cxx  |1 -
 Source/cmScriptGenerator.h |3 -
 Source/cmake.cxx   |6 +-
 24 files changed, 215 insertions(+), 124 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.3.0-632-g6e11703

2015-07-31 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  6e11703c6c9526724040f72c48e2f18616290080 (commit)
   via  60fe4b540b40330e050dbd755204cecbc62d6a37 (commit)
  from  e91f096e1beba3c3d6f71e5c7cbc337c9d9d7282 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e11703c6c9526724040f72c48e2f18616290080
commit 6e11703c6c9526724040f72c48e2f18616290080
Merge: e91f096 60fe4b5
Author: Brad King 
AuthorDate: Fri Jul 31 09:21:43 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:21:43 2015 -0400

Merge topic 'SunOS-link-CXX-normally'

60fe4b54 SunOS: Drop special case for linking C++ shared libraries with gcc 
(#15673)


---

Summary of changes:
 Modules/Platform/SunOS.cmake |8 
 1 file changed, 8 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.3.0-654-g609e8b1

2015-07-31 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  609e8b181a4bf49c5095fff33365606db30e7921 (commit)
   via  c96fe0b40d562b65831376f927b6fd96cf999a52 (commit)
  from  82e77d74304707255265a564678b38ea372813dd (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=609e8b181a4bf49c5095fff33365606db30e7921
commit 609e8b181a4bf49c5095fff33365606db30e7921
Merge: 82e77d7 c96fe0b
Author: Brad King 
AuthorDate: Fri Jul 31 09:21:47 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:21:47 2015 -0400

Merge topic 'cmake-W-options'

c96fe0b4 cmake: Add -W options to control deprecation warnings and errors


---

Summary of changes:
 Help/manual/OPTIONS_BUILD.txt  |   43 +++-
 Help/release/dev/cmake-W-options.rst   |   13 ++
 Help/variable/CMAKE_ERROR_DEPRECATED.rst   |4 +
 Help/variable/CMAKE_WARN_DEPRECATED.rst|4 +
 Source/cmMessageCommand.cxx|   14 +-
 Source/cmake.cxx   |  234 +---
 Source/cmake.h |   27 ++-
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake  |   46 
 .../W_bad-arg1-result.txt} |0
 Tests/RunCMake/CommandLine/W_bad-arg1-stderr.txt   |2 +
 .../W_bad-arg2-result.txt} |0
 Tests/RunCMake/CommandLine/W_bad-arg2-stderr.txt   |2 +
 .../W_bad-arg3-result.txt} |0
 Tests/RunCMake/CommandLine/W_bad-arg3-stderr.txt   |2 +
 Tests/RunCMake/CommandLine/Wdeprecated-stderr.txt  |4 +
 Tests/RunCMake/CommandLine/Wdeprecated.cmake   |1 +
 .../Werror_deprecated-result.txt}  |0
 .../CommandLine/Werror_deprecated-stderr.txt   |4 +
 Tests/RunCMake/CommandLine/Werror_deprecated.cmake |1 +
 .../Werror_dev-result.txt} |0
 Tests/RunCMake/CommandLine/Werror_dev-stderr.txt   |5 +
 Tests/RunCMake/CommandLine/Werror_dev.cmake|1 +
 Tests/RunCMake/CommandLine/Wno-deprecated.cmake|1 +
 .../CommandLine/Wno-error_deprecated.cmake |1 +
 Tests/RunCMake/CommandLine/Wno-error_dev.cmake |1 +
 25 files changed, 369 insertions(+), 41 deletions(-)
 create mode 100644 Help/release/dev/cmake-W-options.rst
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => 
CommandLine/W_bad-arg1-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/W_bad-arg1-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => 
CommandLine/W_bad-arg2-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/W_bad-arg2-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => 
CommandLine/W_bad-arg3-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/W_bad-arg3-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/Wdeprecated-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/Wdeprecated.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => 
CommandLine/Werror_deprecated-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/Werror_deprecated-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/Werror_deprecated.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => 
CommandLine/Werror_dev-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/Werror_dev-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/Werror_dev.cmake
 create mode 100644 Tests/RunCMake/CommandLine/Wno-deprecated.cmake
 create mode 100644 Tests/RunCMake/CommandLine/Wno-error_deprecated.cmake
 create mode 100644 Tests/RunCMake/CommandLine/Wno-error_dev.cmake


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.3.0-630-ge91f096

2015-07-31 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  e91f096e1beba3c3d6f71e5c7cbc337c9d9d7282 (commit)
   via  22809b1665dd2b561fda280d486d099bad6ac877 (commit)
  from  1687060b587ded9e65153280c8ab364b05614b64 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e91f096e1beba3c3d6f71e5c7cbc337c9d9d7282
commit e91f096e1beba3c3d6f71e5c7cbc337c9d9d7282
Merge: 1687060 22809b1
Author: Brad King 
AuthorDate: Fri Jul 31 09:21:41 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:21:41 2015 -0400

Merge topic 'fix-cray-version'

22809b16 Cray: Fix compiler version detection (#15664)


---

Summary of changes:
 Modules/Compiler/Cray-DetermineCompiler.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.3.0-1591-g4413ed8

2015-07-31 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  4413ed800ccfd7adb73eda166442245eb286fe82 (commit)
   via  d4736d53cd61f2cbbb36bec682663b74b01dddce (commit)
  from  2a9b8c6cf786ec1eb0fbfa3be87223b7ec59f1dc (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4413ed800ccfd7adb73eda166442245eb286fe82
commit 4413ed800ccfd7adb73eda166442245eb286fe82
Merge: 2a9b8c6 d4736d5
Author: Brad King 
AuthorDate: Fri Jul 31 09:13:48 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:13:48 2015 -0400

Merge topic 'fix-windows-version-detection' into next

d4736d53 Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4736d53cd61f2cbbb36bec682663b74b01dddce
commit d4736d53cd61f2cbbb36bec682663b74b01dddce
Author: Brad King 
AuthorDate: Thu Jul 30 13:44:31 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:12:41 2015 -0400

Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)

The GetVersionEx API is deprecated, so try RtlGetVersion first.

Co-Author: Christian Maaser

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index cd05c54..1c8d5ea 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -14,6 +14,20 @@
 #if defined(_MSC_VER) && _MSC_VER >= 1800
 # define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
 #endif
+typedef struct {
+  ULONG  dwOSVersionInfoSize;
+  ULONG  dwMajorVersion;
+  ULONG  dwMinorVersion;
+  ULONG  dwBuildNumber;
+  ULONG  dwPlatformId;
+  WCHAR  szCSDVersion[128];
+  USHORT wServicePackMajor;
+  USHORT wServicePackMinor;
+  USHORT wSuiteMask;
+  UCHAR  wProductType;
+  UCHAR  wReserved;
+} CMRTL_OSVERSIONINFOEXW;
+
 #endif
 
 #include "cmGlobalGenerator.h"
@@ -437,23 +451,45 @@ 
cmGlobalGenerator::EnableLanguage(std::vectorconst& languages,
   if (!mf->GetDefinition("CMAKE_SYSTEM"))
 {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-/* Windows version number data.  */
-OSVERSIONINFO osvi;
-ZeroMemory(&osvi, sizeof(osvi));
-osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+CMRTL_OSVERSIONINFOEXW osviex;
+ZeroMemory(&osviex, sizeof(osviex));
+osviex.dwOSVersionInfoSize = sizeof(osviex);
+
+typedef LONG (FAR WINAPI *cmRtlGetVersion)(CMRTL_OSVERSIONINFOEXW*);
+cmRtlGetVersion rtlGetVersion = reinterpret_cast(
+  GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlGetVersion"));
+if (rtlGetVersion && rtlGetVersion(&osviex) == 0)
+  {
+  std::ostringstream windowsVersionString;
+  windowsVersionString << osviex.dwMajorVersion << "."
+   << osviex.dwMinorVersion << "."
+   << osviex.dwBuildNumber;
+  windowsVersionString.str();
+  mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
+windowsVersionString.str().c_str());
+  }
+else
+  {
+  // RtlGetVersion failed, so use the deprecated GetVersionEx function.
+  /* Windows version number data.  */
+  OSVERSIONINFO osvi;
+  ZeroMemory(&osvi, sizeof(osvi));
+  osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
 # pragma warning (push)
 # pragma warning (disable:4996)
 #endif
-GetVersionEx (&osvi);
+  GetVersionEx (&osvi);
 #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
 # pragma warning (pop)
 #endif
-std::ostringstream windowsVersionString;
-windowsVersionString << osvi.dwMajorVersion << "." << osvi.dwMinorVersion;
-windowsVersionString.str();
-mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
-  windowsVersionString.str().c_str());
+  std::ostringstream windowsVersionString;
+  windowsVersionString << osvi.dwMajorVersion << "."
+   << osvi.dwMinorVersion;
+  windowsVersionString.str();
+  mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
+windowsVersionString.str().c_str());
+  }
 #endif
 // Read the DetermineSystem file
 std::string systemFile = mf->GetModulesFile("CMakeDetermineSystem.cmake");

---

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.3.0-1589-g2a9b8c6

2015-07-31 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  2a9b8c6cf786ec1eb0fbfa3be87223b7ec59f1dc (commit)
   via  f057d0f906bbf98891c02e403f4c0cf41f3cf8a8 (commit)
  from  81fd86fa1998a107ab1de090b91c396c1f9e79a5 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9b8c6cf786ec1eb0fbfa3be87223b7ec59f1dc
commit 2a9b8c6cf786ec1eb0fbfa3be87223b7ec59f1dc
Merge: 81fd86f f057d0f
Author: Brad King 
AuthorDate: Fri Jul 31 09:11:56 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:11:56 2015 -0400

Merge topic 'fix-windows-version-detection' into next

f057d0f9 fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on newer versions 
(#15674)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f057d0f906bbf98891c02e403f4c0cf41f3cf8a8
commit f057d0f906bbf98891c02e403f4c0cf41f3cf8a8
Author: Brad King 
AuthorDate: Fri Jul 31 09:10:58 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:10:58 2015 -0400

fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on newer versions (#15674)

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c260c2f..1c8d5ea 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -457,7 +457,7 @@ 
cmGlobalGenerator::EnableLanguage(std::vectorconst& languages,
 
 typedef LONG (FAR WINAPI *cmRtlGetVersion)(CMRTL_OSVERSIONINFOEXW*);
 cmRtlGetVersion rtlGetVersion = reinterpret_cast(
-  GetProcAddress(GetModuleHandle(L"ntdll.dll"), "RtlGetVersion"));
+  GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlGetVersion"));
 if (rtlGetVersion && rtlGetVersion(&osviex) == 0)
   {
   std::ostringstream windowsVersionString;

---

Summary of changes:
 Source/cmGlobalGenerator.cxx |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.3.0-1587-g81fd86f

2015-07-31 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  81fd86fa1998a107ab1de090b91c396c1f9e79a5 (commit)
   via  bdf76620f8239763df27dce59f2695de6ac03392 (commit)
  from  1549af20a9fbeac6535f6f7134afeb3a4849de74 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81fd86fa1998a107ab1de090b91c396c1f9e79a5
commit 81fd86fa1998a107ab1de090b91c396c1f9e79a5
Merge: 1549af2 bdf7662
Author: Brad King 
AuthorDate: Fri Jul 31 09:02:05 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 09:02:05 2015 -0400

Merge topic 'fix-windows-version-detection' into next

bdf76620 fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on newer versions 
(#15674)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bdf76620f8239763df27dce59f2695de6ac03392
commit bdf76620f8239763df27dce59f2695de6ac03392
Author: Brad King 
AuthorDate: Fri Jul 31 09:01:56 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 09:01:56 2015 -0400

fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on newer versions (#15674)

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e171b0a..c260c2f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -484,7 +484,8 @@ 
cmGlobalGenerator::EnableLanguage(std::vectorconst& languages,
 # pragma warning (pop)
 #endif
   std::ostringstream windowsVersionString;
-  windowsVersionString << osvi.dwMajorVersion << "." << 
osvi.dwMinorVersion;
+  windowsVersionString << osvi.dwMajorVersion << "."
+   << osvi.dwMinorVersion;
   windowsVersionString.str();
   mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
 windowsVersionString.str().c_str());

---

Summary of changes:
 Source/cmGlobalGenerator.cxx |3 ++-
 1 file changed, 2 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, next, updated. v3.3.0-1585-g1549af2

2015-07-31 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  1549af20a9fbeac6535f6f7134afeb3a4849de74 (commit)
   via  f7a9ed7e90cd2661b279d0bcd44d43620b8eeda1 (commit)
  from  6b24fa692f950a95e500ad3f41c51b9db642afa4 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1549af20a9fbeac6535f6f7134afeb3a4849de74
commit 1549af20a9fbeac6535f6f7134afeb3a4849de74
Merge: 6b24fa6 f7a9ed7
Author: Brad King 
AuthorDate: Fri Jul 31 08:46:47 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 08:46:47 2015 -0400

Merge topic 'fix-xcode-quoting' into next

f7a9ed7e Xcode: Quote strings containing a tilde (#15672)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7a9ed7e90cd2661b279d0bcd44d43620b8eeda1
commit f7a9ed7e90cd2661b279d0bcd44d43620b8eeda1
Author: Gregor Jasny 
AuthorDate: Fri Jul 31 13:41:15 2015 +0200
Commit: Brad King 
CommitDate: Fri Jul 31 08:44:27 2015 -0400

Xcode: Quote strings containing a tilde (#15672)

Since commit v3.3.0-rc1~183^2 (Xcode: Refine quoting rules for Strings,
2015-04-09) we no longer quote strings containing a period ('.').
However, file names like "icon29x29~ipad.png" still need quoting because
they contain a tilde ('~').  Add tilde to our explicit list of
characters that need quoting because such file names will no longer
happen to be quoted because they contain a period.

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index e72d315..ba6e395 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,7 @@ void cmXCodeObject::PrintString(std::ostream& 
os,std::string String)
   bool needQuote =
 (String.empty() ||
  String.find("//") != String.npos ||
- String.find_first_of(" <>+-*=@[](){},") != String.npos);
+ String.find_first_of(" <>+-*=@[](){},~") != String.npos);
   const char* quote = needQuote? "\"" : "";
 
   // Print the string, quoted and escaped as necessary.

---

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.3.0-1583-g6b24fa6

2015-07-31 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  6b24fa692f950a95e500ad3f41c51b9db642afa4 (commit)
   via  9fbba28928d5fe8d5ab3b2750287dae28d2464f1 (commit)
  from  22d1597f20869110edca4411236e8f5263cd5ece (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b24fa692f950a95e500ad3f41c51b9db642afa4
commit 6b24fa692f950a95e500ad3f41c51b9db642afa4
Merge: 22d1597 9fbba28
Author: Brad King 
AuthorDate: Fri Jul 31 08:41:55 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 08:41:55 2015 -0400

Merge topic 'fix-xcode-quoting' into next

9fbba289 fixup! Xcode: Properly quote strings containing a tilde


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9fbba28928d5fe8d5ab3b2750287dae28d2464f1
commit 9fbba28928d5fe8d5ab3b2750287dae28d2464f1
Author: Brad King 
AuthorDate: Fri Jul 31 08:41:13 2015 -0400
Commit: Brad King 
CommitDate: Fri Jul 31 08:41:16 2015 -0400

fixup! Xcode: Properly quote strings containing a tilde

We don't maintain release notes for bug fixes, just features.

diff --git a/Help/release/dev/fix-xcode-quoting.rst 
b/Help/release/dev/fix-xcode-quoting.rst
deleted file mode 100644
index 33c47cc..000
--- a/Help/release/dev/fix-xcode-quoting.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-fix-xcode-quoting
--
-
-* During CMake 3.3 development a patch landed in CMake which made the
-  CMake Xcode generator produce project files just like Xcode does.
-  Xcode does not quote strings containing a period. That's why CMake
-  stopped quoting those, too. But Xcode needs quoting for string with
-  a tilde like ``icon29x29~ipad.png`` which were covered before due to
-  the containing period. CMake now properly quotes strings containing
-  a tilde.
\ No newline at end of file

---

Summary of changes:
 Help/release/dev/fix-xcode-quoting.rst |   10 --
 1 file changed, 10 deletions(-)
 delete mode 100644 Help/release/dev/fix-xcode-quoting.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, next, updated. v3.3.0-1581-g22d1597

2015-07-31 Thread Matt McCormick 
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  22d1597f20869110edca4411236e8f5263cd5ece (commit)
   via  6166a4a2536ec0142a12ee0ae04eee6591863e06 (commit)
   via  dbae465c288e3240837213570b3e1e992482c180 (commit)
   via  7d2db56ef9735e47ccdaf8dba994ac10bc1d7ef1 (commit)
  from  45a48d7e23bae2590516118643d592f02f69ff4e (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22d1597f20869110edca4411236e8f5263cd5ece
commit 22d1597f20869110edca4411236e8f5263cd5ece
Merge: 45a48d7 6166a4a
Author: Matt McCormick 
AuthorDate: Fri Jul 31 08:37:28 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 08:37:28 2015 -0400

Merge topic 'if-test' into next

6166a4a2 ExternalProject: Silence warnings related to TEST use in if().
dbae465c CMake: Add CMP0064 for TEST operator in if() command.
7d2db56e CMake: if command understands if(TEST TestName)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6166a4a2536ec0142a12ee0ae04eee6591863e06
commit 6166a4a2536ec0142a12ee0ae04eee6591863e06
Author: Matt McCormick 
AuthorDate: Wed Jul 29 14:46:40 2015 -0400
Commit: Matt McCormick 
CommitDate: Wed Jul 29 14:46:40 2015 -0400

ExternalProject: Silence warnings related to TEST use in if().

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index f6844be..fdb146a 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -1211,7 +1211,7 @@ function(_ep_get_build_command name step cmd_var)
 if(step STREQUAL "INSTALL")
   set(args install)
 endif()
-if(step STREQUAL "TEST")
+if("x${step}x" STREQUAL "xTESTx")
   set(args test)
 endif()
   else()
@@ -1230,7 +1230,7 @@ function(_ep_get_build_command name step cmd_var)
   list(APPEND args --target install)
 endif()
 # But for "TEST" drive the project with corresponding "ctest".
-if(step STREQUAL "TEST")
+if("x${step}x" STREQUAL "xTESTx")
   string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd 
"${cmd}")
   set(args "")
 endif()
@@ -1246,7 +1246,7 @@ function(_ep_get_build_command name step cmd_var)
   if(step STREQUAL "INSTALL")
 set(args install)
   endif()
-  if(step STREQUAL "TEST")
+  if("x${step}x" STREQUAL "xTESTx")
 set(args test)
   endif()
 endif()

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbae465c288e3240837213570b3e1e992482c180
commit dbae465c288e3240837213570b3e1e992482c180
Author: Matt McCormick 
AuthorDate: Tue Jul 28 22:43:59 2015 -0400
Commit: Matt McCormick 
CommitDate: Wed Jul 29 14:13:32 2015 -0400

CMake: Add CMP0064 for TEST operator in if() command.

The new TEST operator for the if() command is not recognized until
CMP0064 is set to NEW.

diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 0a313cd..590f10d 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -121,3 +121,4 @@ All Policies
/policy/CMP0061
/policy/CMP0062
/policy/CMP0063
+   /policy/CMP0064
diff --git a/Help/policy/CMP0064.rst b/Help/policy/CMP0064.rst
new file mode 100644
index 000..e9a061b
--- /dev/null
+++ b/Help/policy/CMP0064.rst
@@ -0,0 +1,17 @@
+CMP0064
+---
+
+Recognize ``TEST`` as a operator for the :command:`if` command.
+
+The ``TEST`` operator was added to the :command:`if` command to determine if a
+given test name was created by the :command:`add_test` command.
+
+The ``OLD`` behavior for this policy is to ignore the ``TEST`` operator.
+The ``NEW`` behavior is to interpret the ``TEST`` operator.
+
+This policy was introduced in CMake version 3.4.  CMake version
+|release| warns when the policy is not set and uses ``OLD`` behavior.  Use
+the :command:`cmake_policy()` command to set it to ``OLD`` or ``NEW``
+explicitly.
+
+.. include:: DEPRECATED.txt
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index bcbc3b6..7874803 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -16,7 +16,8 @@ cmConditionEvaluator::cmConditionEvaluator(cmMakefile& 
makefile):
   Makefile(makefile),
   Policy12Status(makefile.GetPolicyStatus(cmPolicies::CMP0012)),
   Policy54Status(makefile.GetPolicyStatus(cmPolicies::CMP0054)),
-  Policy57Status(makefile.GetPolicyStatus(cmPolicies::CMP0057))
+  Policy57Status(makefile.GetPolicyStatus(cmPolicies::CMP0057)),
+  Policy64Status(makefile.GetPolicyStatus(cmPolicies::CMP0064))
 {
 
 }
@@ -494,12 +495,27 @@ bool cmCon

[Cmake-commits] CMake branch, next, updated. v3.3.0-1577-g45a48d7

2015-07-31 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  45a48d7e23bae2590516118643d592f02f69ff4e (commit)
   via  da0480be5d8d03c5c5c4f14fbc4e1dcfed532620 (commit)
   via  1687060b587ded9e65153280c8ab364b05614b64 (commit)
  from  d42ee02881817f90451a6fdb0f983ab5fd56a3e5 (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 -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45a48d7e23bae2590516118643d592f02f69ff4e
commit 45a48d7e23bae2590516118643d592f02f69ff4e
Merge: d42ee02 da0480b
Author: Gregor Jasny 
AuthorDate: Fri Jul 31 07:55:18 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Fri Jul 31 07:55:18 2015 -0400

Merge topic 'fix-xcode-quoting' into next

da0480be Xcode: Properly quote strings containing a tilde
1687060b CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da0480be5d8d03c5c5c4f14fbc4e1dcfed532620
commit da0480be5d8d03c5c5c4f14fbc4e1dcfed532620
Author: Gregor Jasny 
AuthorDate: Fri Jul 31 13:41:15 2015 +0200
Commit: Gregor Jasny 
CommitDate: Fri Jul 31 13:46:39 2015 +0200

Xcode: Properly quote strings containing a tilde

During CMake 3.3 development a patch landed in CMake which
made the CMake Xcode generator produce project files just
like Xcode does. Xcode does not quote strings containing a
period. That's why CMake stopped quoting those, too. But
Xcode needs quoting for string with a tilde like
icon29x29~ipad.png which were covered before due to
the containing period.

This fixes CMake bug #15672.

diff --git a/Help/release/dev/fix-xcode-quoting.rst 
b/Help/release/dev/fix-xcode-quoting.rst
new file mode 100644
index 000..33c47cc
--- /dev/null
+++ b/Help/release/dev/fix-xcode-quoting.rst
@@ -0,0 +1,10 @@
+fix-xcode-quoting
+-
+
+* During CMake 3.3 development a patch landed in CMake which made the
+  CMake Xcode generator produce project files just like Xcode does.
+  Xcode does not quote strings containing a period. That's why CMake
+  stopped quoting those, too. But Xcode needs quoting for string with
+  a tilde like ``icon29x29~ipad.png`` which were covered before due to
+  the containing period. CMake now properly quotes strings containing
+  a tilde.
\ No newline at end of file
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index e72d315..ba6e395 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,7 @@ void cmXCodeObject::PrintString(std::ostream& 
os,std::string String)
   bool needQuote =
 (String.empty() ||
  String.find("//") != String.npos ||
- String.find_first_of(" <>+-*=@[](){},") != String.npos);
+ String.find_first_of(" <>+-*=@[](){},~") != String.npos);
   const char* quote = needQuote? "\"" : "";
 
   // Print the string, quoted and escaped as necessary.

---

Summary of changes:
 Help/release/dev/fix-xcode-quoting.rst |   10 ++
 Source/CMakeVersion.cmake  |2 +-
 Source/cmXCodeObject.cxx   |2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/fix-xcode-quoting.rst


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