[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-304-g893a7fc

2015-10-20 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  893a7fc2ed71760e1c76c4639985d0e1aec87d04 (commit)
  from  9afbb733ec2a55424e6c25c6afa7fdd14219d6b1 (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=893a7fc2ed71760e1c76c4639985d0e1aec87d04
commit 893a7fc2ed71760e1c76c4639985d0e1aec87d04
Author: Kitware Robot 
AuthorDate: Wed Oct 21 00:01:06 2015 -0400
Commit: Kitware Robot 
CommitDate: Wed Oct 21 00:01:06 2015 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 8bbaa0e..d1132d2 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 4)
-set(CMake_VERSION_PATCH 20151020)
+set(CMake_VERSION_PATCH 20151021)
 #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.4.0-rc1-778-ga174f7e

2015-10-20 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  a174f7e14b464be73a4282f9d1ade942f1476b5c (commit)
   via  47f10ce212e3b0cdcbf72c2c24b257ba3ae3d935 (commit)
  from  edb731113d63696ae691dfca207c2155129ff27c (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=a174f7e14b464be73a4282f9d1ade942f1476b5c
commit a174f7e14b464be73a4282f9d1ade942f1476b5c
Merge: edb7311 47f10ce
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 19:18:16 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 19:18:16 2015 -0400

Merge topic 'cmLocalGenerator-generator-target-storage' into next

47f10ce2 Revert "cmLocalGenerator: Store a vector of generator targets."


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47f10ce212e3b0cdcbf72c2c24b257ba3ae3d935
commit 47f10ce212e3b0cdcbf72c2c24b257ba3ae3d935
Author: Stephen Kelly 
AuthorDate: Wed Oct 21 01:17:46 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 21 01:17:46 2015 +0200

Revert "cmLocalGenerator: Store a vector of generator targets."

This reverts commit 2ac7d953c36c36293922e53daed7a1737a813d23.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 1921f03..31c05fd 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,13 +965,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() 
const
it != this->GlobalGenerator->GetLocalGenerators().end();
++it)
 {
-std::vector targets = (*it)->GetGeneratorTargets();
-for (std::vector::iterator l = targets.begin();
+cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
+for (cmGeneratorTargetsType::iterator l = targets.begin();
  l != targets.end(); ++l)
   {
   std::vector includeDirs;
   std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  (*it)->GetIncludeDirectories(includeDirs, *l, "C", config);
+  (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
   this->AppendIncludeDirectories(fout, includeDirs, emmited);
   }
 }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 32cfcea..a55365f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1584,7 +1584,7 @@ void 
cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
   cmTarget* t = &ti->second;
   cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
   this->GeneratorTargets[t] = gt;
-  lg->AddGeneratorTarget(gt);
+  lg->AddGeneratorTarget(t, gt);
   }
 }
 
diff --git a/Source/cmGlobalKdevelopGenerator.cxx 
b/Source/cmGlobalKdevelopGenerator.cxx
index 8659e34..4eec3fb 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,14 +68,13 @@ void cmGlobalKdevelopGenerator::Generate()
 for (std::vector::const_iterator lg=lgs.begin();
  lg!=lgs.end(); lg++)
   {
-  std::vector const& targets =
-  (*lg)->GetGeneratorTargets();
-  for (std::vector::const_iterator ti =
-   targets.begin(); ti != targets.end(); ti++)
+  cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
+  for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
+   ti != targets.end(); ti++)
 {
-if ((*ti)->GetType()==cmState::EXECUTABLE)
+if (ti->second->GetType()==cmState::EXECUTABLE)
   {
-  executable = (*ti)->GetLocation("");
+  executable = ti->second->GetLocation("");
   break;
   }
 }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx 
b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 74d23a3..44e3de6 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -460,11 +460,11 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector depends;
-  std::vector targets = lg->GetGeneratorTargets();
-  for(std::vector::iterator l = targets.begin();
+  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
+  for(cmGeneratorTargetsType::iterator l = targets.begin();
   l != targets.end(); ++l)
 {
-cmGeneratorTarget* gtarget = *l;
+cmGeneratorTarget* gtarget = l->second;
 int type = gtarget->GetType();
 if((type == cmState::EXECUTABLE) ||
(type == cmState::STATIC_LIBRARY) ||
@@ -623,11 +623,11 @@ cmGlobalUnixMakefileGenerator3
 lg = static_cast
   (this->LocalGenerators[i]);
 //

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-780-g2fc8bee

2015-10-20 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  2fc8bee548c8d15d34ae9357523e0d5423026c03 (commit)
   via  a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8 (commit)
  from  a174f7e14b464be73a4282f9d1ade942f1476b5c (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=2fc8bee548c8d15d34ae9357523e0d5423026c03
commit 2fc8bee548c8d15d34ae9357523e0d5423026c03
Merge: a174f7e a4bbdc5
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 19:18:38 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 19:18:38 2015 -0400

Merge topic 'cmLocalGenerator-generator-target-storage' into next

a4bbdc5e cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8
commit a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8
Author: Stephen Kelly 
AuthorDate: Sun Oct 18 16:32:43 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 21 01:18:27 2015 +0200

cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index aecae35..a55365f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1574,7 +1574,6 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
 void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
cmLocalGenerator *lg)
 {
-  cmGeneratorTargetsType generatorTargets;
   cmMakefile* mf = lg->GetMakefile();
   if (targetTypes == AllTargets)
 {
@@ -1585,7 +1584,7 @@ void 
cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
   cmTarget* t = &ti->second;
   cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
   this->GeneratorTargets[t] = gt;
-  generatorTargets[t] = gt;
+  lg->AddGeneratorTarget(t, gt);
   }
 }
 
@@ -1596,7 +1595,6 @@ void 
cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
 cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
 this->GeneratorTargets[*j] = gt;
 }
-  lg->SetGeneratorTargets(generatorTargets);
 }
 
 //
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 2bc0e4a..307c67f 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -118,10 +118,6 @@ public:
   return this->GeneratorTargets;
 }
 
-  void SetGeneratorTargets(const cmGeneratorTargetsType &targets)
-{
-  this->GeneratorTargets = targets;
-}
   void AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt);
 
   cmGeneratorTarget* FindGeneratorTargetToUse(const std::string& name) const;

---

Summary of changes:


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

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-776-gedb7311

2015-10-20 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  edb731113d63696ae691dfca207c2155129ff27c (commit)
   via  c099e00fc0a9c47a2addaca145952b1c33195fab (commit)
   via  d74bca5a8fee1d45c60b60a70a2a1a90abb74180 (commit)
   via  c6e86955086e1824cd666bc69c802d48074cc138 (commit)
   via  18046bd50a502508f170baa6cec5c81efb33f180 (commit)
   via  91411641a7b8029d05899b11590fb4e676716a85 (commit)
   via  6d94078e623d5f1316f1972ffda06ac1d66b6f2f (commit)
   via  3ebc62850c7461dca4723b063b5e5f019409db84 (commit)
   via  311018e5ad27abf7c76003ec91d3f26ef316e3cc (commit)
  from  d06f93ac425f3fc61720fb2752111457e4b56431 (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=edb731113d63696ae691dfca207c2155129ff27c
commit edb731113d63696ae691dfca207c2155129ff27c
Merge: d06f93a c099e00
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 18:53:36 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 18:53:36 2015 -0400

Merge topic 'use-generator-target' into next

c099e00f Access policy status from cmGeneratorTarget at generate time.
d74bca5a cmGeneratorTarget: Copy the policy map from the cmTarget.
c6e86955 cmTarget: Remove unused NameResolvesToFramework.
18046bd5 cmCommonTargetGenerator: Use NameResolvesToFramework without 
cmTarget.
91411641 Move ComputeLinkType out of cmTarget.
6d94078e cmGeneratorTarget: Move IsDLLPlatform from cmTarget.
3ebc6285 cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.
311018e5 cmGeneratorTarget: Move GetExportMacro from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c099e00fc0a9c47a2addaca145952b1c33195fab
commit c099e00fc0a9c47a2addaca145952b1c33195fab
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 01:12:37 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 21 00:52:23 2015 +0200

Access policy status from cmGeneratorTarget at generate time.

diff --git a/Source/cmComputeLinkInformation.cxx 
b/Source/cmComputeLinkInformation.cxx
index eca0f66..a32bb48 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -407,7 +407,7 @@ cmComputeLinkInformation
   // order to support such projects we need to add the directories
   // containing libraries linked with a full path to the -L path.
   this->OldLinkDirMode =
-this->Target->Target->GetPolicyStatusCMP0003() != cmPolicies::NEW;
+this->Target->GetPolicyStatusCMP0003() != cmPolicies::NEW;
   if(this->OldLinkDirMode)
 {
 // Construct a mask to not bother with this behavior for link
@@ -1140,7 +1140,7 @@ void cmComputeLinkInformation::AddFullItem(std::string 
const& item)
   // Full path libraries should specify a valid library file name.
   // See documentation of CMP0008.
   std::string generator = this->GlobalGenerator->GetName();
-  if(this->Target->Target->GetPolicyStatusCMP0008() != cmPolicies::NEW &&
+  if(this->Target->GetPolicyStatusCMP0008() != cmPolicies::NEW &&
  (generator.find("Visual Studio") != generator.npos ||
   generator.find("Xcode") != generator.npos))
 {
@@ -1221,7 +1221,7 @@ bool 
cmComputeLinkInformation::CheckImplicitDirItem(std::string const& item)
 }
 
   // Check the policy for whether we should use the approach below.
-  switch (this->Target->Target->GetPolicyStatusCMP0060())
+  switch (this->Target->GetPolicyStatusCMP0060())
 {
 case cmPolicies::WARN:
   if (this->CMP0060Warn)
@@ -1531,7 +1531,7 @@ void 
cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
   this->OrderLinkerSearchPath->AddLinkLibrary(item);
 
   // Produce any needed message.
-  switch(this->Target->Target->GetPolicyStatusCMP0008())
+  switch(this->Target->GetPolicyStatusCMP0008())
 {
 case cmPolicies::WARN:
   {
@@ -1583,7 +1583,7 @@ bool 
cmComputeLinkInformation::FinishLinkerSearchDirectories()
 }
 
   // Enforce policy constraints.
-  switch(this->Target->Target->GetPolicyStatusCMP0003())
+  switch(this->Target->GetPolicyStatusCMP0003())
 {
 case cmPolicies::WARN:
   if(!this->CMakeInstance->GetState()
diff --git a/Source/cmComputeTargetDepends.cxx 
b/Source/cmComputeTargetDepends.cxx
index 2ae8084..03f4fdd 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -362,7 +362,7 @@ void cmComputeTargetDepends::AddTargetDepend(
 cmake::MessageType messageType = cmake::AUTHOR_WARNING;
 bool issueMessage = false;
 std::ostringstream e;
-switch(depender->Target->GetPolicyStatusCMP0046())
+switch(depender->GetPolicyStatusCMP0046())
   {
   case cmPol

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-767-gd06f93a

2015-10-20 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  d06f93ac425f3fc61720fb2752111457e4b56431 (commit)
   via  876808594963e8b4547e415aaa755cb115eb1bed (commit)
  from  9407f9732a9c7b32b5689094cbd29a3a74a0d6a5 (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=d06f93ac425f3fc61720fb2752111457e4b56431
commit d06f93ac425f3fc61720fb2752111457e4b56431
Merge: 9407f97 8768085
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 18:53:07 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 18:53:07 2015 -0400

Merge topic 'use-generator-target' into next

87680859 fixup! cmGeneratorTarget: Move GetExportMacro from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=876808594963e8b4547e415aaa755cb115eb1bed
commit 876808594963e8b4547e415aaa755cb115eb1bed
Author: Stephen Kelly 
AuthorDate: Wed Oct 21 00:51:57 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 21 00:51:57 2015 +0200

fixup! cmGeneratorTarget: Move GetExportMacro from cmTarget.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx 
b/Source/cmLocalVisualStudio6Generator.cxx
index 314d9bf..a51eb67 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -1543,7 +1543,7 @@ void cmLocalVisualStudio6Generator
 
   // Add the export symbol definition for shared library objects.
   std::string exportSymbol;
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = gt->GetExportMacro())
 {
 exportSymbol = exportMacro;
 }
diff --git a/Source/cmLocalVisualStudio7Generator.cxx 
b/Source/cmLocalVisualStudio7Generator.cxx
index 5e76f8a..819998c 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -777,7 +777,7 @@ void 
cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
   targetOptions.AddDefine(configDefine);
 
   // Add the export symbol definition for shared library objects.
-  if(const char* exportMacro = target->GetExportMacro())
+  if(const char* exportMacro = gt->GetExportMacro())
 {
 targetOptions.AddDefine(exportMacro);
 }

---

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |2 +-
 Source/cmLocalVisualStudio7Generator.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-765-g9407f97

2015-10-20 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  9407f9732a9c7b32b5689094cbd29a3a74a0d6a5 (commit)
   via  cde492f0b1d5cdd7106f937cfc53108f821e9876 (commit)
   via  25601a41cdfd2381cbfb54d2756317e96a297cd5 (commit)
   via  2388d660afbce79a91468546cdd561c32a264086 (commit)
   via  0d946486ef25927b8ececefda8fc2fdb2046bcad (commit)
   via  e4cd731d0518276fdc8e1a51885044d600a0293b (commit)
   via  d9423b618c7c8e70e7f2b27adff57dd9dbe4bf94 (commit)
   via  056af502257c68f6670313d65c96c80341af0110 (commit)
   via  a4991893050f0611d3593dad84c2d8b72326b015 (commit)
   via  215cd21a0238ba00aec7c81014fe83e3d47187a6 (commit)
   via  1df8bd3ab0f6621b90a8801c1d10cfc94c74ff96 (commit)
   via  83703bda7d1017e1f75ec1b92d672d5ef17194d5 (commit)
  from  7fcccb9f7b854319c23febac9c9280c271e8740c (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=9407f9732a9c7b32b5689094cbd29a3a74a0d6a5
commit 9407f9732a9c7b32b5689094cbd29a3a74a0d6a5
Merge: 7fcccb9 cde492f
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 18:45:44 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 18:45:44 2015 -0400

Merge topic 'use-generator-target' into next

cde492f0 Access policy status from cmGeneratorTarget at generate time.
25601a41 cmGeneratorTarget: Copy the policy map from the cmTarget.
2388d660 cmTarget: Remove unused NameResolvesToFramework.
0d946486 cmCommonTargetGenerator: Use NameResolvesToFramework without 
cmTarget.
e4cd731d Move ComputeLinkType out of cmTarget.
d9423b61 cmGeneratorTarget: Move IsDLLPlatform from cmTarget.
056af502 cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.
a4991893 cmGeneratorTarget: Move GetExportMacro from cmTarget.
215cd21a cmGeneratorTarget: Provide direct access to the backtrace.
1df8bd3a cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget.
83703bda cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cde492f0b1d5cdd7106f937cfc53108f821e9876
commit cde492f0b1d5cdd7106f937cfc53108f821e9876
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 01:12:37 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 21 00:37:04 2015 +0200

Access policy status from cmGeneratorTarget at generate time.

diff --git a/Source/cmComputeLinkInformation.cxx 
b/Source/cmComputeLinkInformation.cxx
index eca0f66..a32bb48 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -407,7 +407,7 @@ cmComputeLinkInformation
   // order to support such projects we need to add the directories
   // containing libraries linked with a full path to the -L path.
   this->OldLinkDirMode =
-this->Target->Target->GetPolicyStatusCMP0003() != cmPolicies::NEW;
+this->Target->GetPolicyStatusCMP0003() != cmPolicies::NEW;
   if(this->OldLinkDirMode)
 {
 // Construct a mask to not bother with this behavior for link
@@ -1140,7 +1140,7 @@ void cmComputeLinkInformation::AddFullItem(std::string 
const& item)
   // Full path libraries should specify a valid library file name.
   // See documentation of CMP0008.
   std::string generator = this->GlobalGenerator->GetName();
-  if(this->Target->Target->GetPolicyStatusCMP0008() != cmPolicies::NEW &&
+  if(this->Target->GetPolicyStatusCMP0008() != cmPolicies::NEW &&
  (generator.find("Visual Studio") != generator.npos ||
   generator.find("Xcode") != generator.npos))
 {
@@ -1221,7 +1221,7 @@ bool 
cmComputeLinkInformation::CheckImplicitDirItem(std::string const& item)
 }
 
   // Check the policy for whether we should use the approach below.
-  switch (this->Target->Target->GetPolicyStatusCMP0060())
+  switch (this->Target->GetPolicyStatusCMP0060())
 {
 case cmPolicies::WARN:
   if (this->CMP0060Warn)
@@ -1531,7 +1531,7 @@ void 
cmComputeLinkInformation::HandleBadFullItem(std::string const& item,
   this->OrderLinkerSearchPath->AddLinkLibrary(item);
 
   // Produce any needed message.
-  switch(this->Target->Target->GetPolicyStatusCMP0008())
+  switch(this->Target->GetPolicyStatusCMP0008())
 {
 case cmPolicies::WARN:
   {
@@ -1583,7 +1583,7 @@ bool 
cmComputeLinkInformation::FinishLinkerSearchDirectories()
 }
 
   // Enforce policy constraints.
-  switch(this->Target->Target->GetPolicyStatusCMP0003())
+  switch(this->Target->GetPolicyStatusCMP0003())
 {
 case cmPolicies::WARN:
   if(!this->CMakeInstance->GetState()
diff --git a/Source/cmComputeTargetDepends.cxx 
b/Source/cmComputeTargetDepends.cxx
index 2ae8084..0

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-753-g7fcccb9

2015-10-20 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  7fcccb9f7b854319c23febac9c9280c271e8740c (commit)
   via  2ac7d953c36c36293922e53daed7a1737a813d23 (commit)
   via  379d66ac571ff5082db73cb48a29a3ce4c51ebd2 (commit)
   via  04b6bb167636ccf2fe565239a44249366ee1e452 (commit)
   via  400e3d19fcebf7d6e9551d585d60754bd937c28c (commit)
   via  726e461b3885aca4144ec79d08bf62c7ebade96d (commit)
  from  657b36f08e5329c2fdcd6f299685796dc8abfbd0 (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=7fcccb9f7b854319c23febac9c9280c271e8740c
commit 7fcccb9f7b854319c23febac9c9280c271e8740c
Merge: 657b36f 2ac7d95
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 18:43:57 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 18:43:57 2015 -0400

Merge topic 'cmLocalGenerator-generator-target-storage' into next

2ac7d953 cmLocalGenerator: Store a vector of generator targets.
379d66ac cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.
04b6bb16 cmLocalGenerator: Simplify semantic of adding generator targets.
400e3d19 cmLocalGenerator: Don't store imported generator targets
726e461b CMP0063: Split unit test by target type.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ac7d953c36c36293922e53daed7a1737a813d23
commit 2ac7d953c36c36293922e53daed7a1737a813d23
Author: Stephen Kelly 
AuthorDate: Sun Oct 18 16:53:00 2015 +0200
Commit: Stephen Kelly 
CommitDate: Tue Oct 20 23:58:49 2015 +0200

cmLocalGenerator: Store a vector of generator targets.

Not a map from cmTarget to cmGeneratorTarget.

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx 
b/Source/cmExtraEclipseCDT4Generator.cxx
index 31c05fd..1921f03 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -965,13 +965,13 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() 
const
it != this->GlobalGenerator->GetLocalGenerators().end();
++it)
 {
-cmGeneratorTargetsType targets = (*it)->GetGeneratorTargets();
-for (cmGeneratorTargetsType::iterator l = targets.begin();
+std::vector targets = (*it)->GetGeneratorTargets();
+for (std::vector::iterator l = targets.begin();
  l != targets.end(); ++l)
   {
   std::vector includeDirs;
   std::string config = mf->GetSafeDefinition("CMAKE_BUILD_TYPE");
-  (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
+  (*it)->GetIncludeDirectories(includeDirs, *l, "C", config);
   this->AppendIncludeDirectories(fout, includeDirs, emmited);
   }
 }
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a55365f..32cfcea 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1584,7 +1584,7 @@ void 
cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
   cmTarget* t = &ti->second;
   cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
   this->GeneratorTargets[t] = gt;
-  lg->AddGeneratorTarget(t, gt);
+  lg->AddGeneratorTarget(gt);
   }
 }
 
diff --git a/Source/cmGlobalKdevelopGenerator.cxx 
b/Source/cmGlobalKdevelopGenerator.cxx
index 4eec3fb..8659e34 100644
--- a/Source/cmGlobalKdevelopGenerator.cxx
+++ b/Source/cmGlobalKdevelopGenerator.cxx
@@ -68,13 +68,14 @@ void cmGlobalKdevelopGenerator::Generate()
 for (std::vector::const_iterator lg=lgs.begin();
  lg!=lgs.end(); lg++)
   {
-  cmGeneratorTargetsType const& targets = (*lg)->GetGeneratorTargets();
-  for (cmGeneratorTargetsType::const_iterator ti = targets.begin();
-   ti != targets.end(); ti++)
+  std::vector const& targets =
+  (*lg)->GetGeneratorTargets();
+  for (std::vector::const_iterator ti =
+   targets.begin(); ti != targets.end(); ti++)
 {
-if (ti->second->GetType()==cmState::EXECUTABLE)
+if ((*ti)->GetType()==cmState::EXECUTABLE)
   {
-  executable = ti->second->GetLocation("");
+  executable = (*ti)->GetLocation("");
   break;
   }
 }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx 
b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 44e3de6..74d23a3 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -460,11 +460,11 @@ cmGlobalUnixMakefileGenerator3
   // The directory-level rule should depend on the target-level rules
   // for all targets in the directory.
   std::vector depends;
-  cmGeneratorTargetsType targets = lg->GetGeneratorTargets();
-  for(cmGeneratorTargetsType::

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-747-g657b36f

2015-10-20 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  657b36f08e5329c2fdcd6f299685796dc8abfbd0 (commit)
   via  c0969b10330a205a693bdf658185740eea51736e (commit)
   via  6a1e73281f216d2644dc3527be01c3d38b9e1263 (commit)
   via  00f50b006cc9afd014374fabc10bdef1330075a2 (commit)
  from  a3de829edbb478a949ae9877e6a1541657869305 (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=657b36f08e5329c2fdcd6f299685796dc8abfbd0
commit 657b36f08e5329c2fdcd6f299685796dc8abfbd0
Merge: a3de829 c0969b1
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 18:43:35 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 18:43:35 2015 -0400

Merge topic 'inline-cmMakeDepend-content' into next

c0969b10 cmMakeDepend: Inline into inheriting class.
6a1e7328 cmMakeDepend: Inline into only user.
00f50b00 cmMakeDepend: Inline into header.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0969b10330a205a693bdf658185740eea51736e
commit c0969b10330a205a693bdf658185740eea51736e
Author: Stephen Kelly 
AuthorDate: Mon Oct 19 22:14:14 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 21 00:41:53 2015 +0200

cmMakeDepend: Inline into inheriting class.

Devirtualize the API.

diff --git a/Source/cmOutputRequiredFilesCommand.cxx 
b/Source/cmOutputRequiredFilesCommand.cxx
index 19d93d9..54208ac 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -72,16 +72,13 @@ public:
   }
 };
 
-
-// cmMakeDepend is used to generate dependancy information for
-// the classes in a makefile
-class cmMakeDepend
+class cmLBDepend
 {
 public:
   /**
* Construct the object with verbose turned off.
*/
-  cmMakeDepend()
+  cmLBDepend()
   {
 this->Verbose = false;
 this->IncludeFileRegularExpression.compile("^.*$");
@@ -91,7 +88,7 @@ public:
   /**
* Destructor.
*/
-  virtual ~cmMakeDepend()
+  ~cmLBDepend()
   {
 cmDeleteAll(this->DependInformationMap);
   }
@@ -99,7 +96,7 @@ public:
   /**
* Set the makefile that is used as a source of classes.
*/
-  virtual void SetMakefile(cmMakefile* makefile)
+  void SetMakefile(cmMakefile* makefile)
   {
 this->Makefile = makefile;
 
@@ -153,7 +150,7 @@ public:
   /**
* Add a directory to the search path for include files.
*/
-  virtual void AddSearchPath(const std::string& path)
+  void AddSearchPath(const std::string& path)
   {
 this->IncludeDirectories.push_back(path);
   }
@@ -173,25 +170,48 @@ protected:
   /**
* Compute the depend information for this class.
*/
-  virtual void DependWalk(cmDependInformation* info)
+
+  void DependWalk(cmDependInformation* info)
   {
-cmsys::RegularExpression includeLine
-("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
 cmsys::ifstream fin(info->FullPath.c_str());
 if(!fin)
   {
-  cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
+  cmSystemTools::Error("error can not open ", info->FullPath.c_str());
   return;
   }
 
-// TODO: Write real read loop (see cmSystemTools::CopyFile).
 std::string line;
-while( cmSystemTools::GetLineFromStream(fin, line) )
+while(cmSystemTools::GetLineFromStream(fin, line))
   {
-  if(includeLine.find(line.c_str()))
+  if(cmHasLiteralPrefix(line.c_str(), "#include"))
 {
+// if it is an include line then create a string class
+std::string currentline = line;
+size_t qstart = currentline.find('\"', 8);
+size_t qend;
+// if a quote is not found look for a <
+if(qstart == std::string::npos)
+  {
+  qstart = currentline.find('<', 8);
+  // if a < is not found then move on
+  if(qstart == std::string::npos)
+{
+cmSystemTools::Error("unknown include directive ",
+ currentline.c_str() );
+continue;
+}
+  else
+{
+qend = currentline.find('>', qstart+1);
+}
+  }
+else
+  {
+  qend = currentline.find('\"', qstart+1);
+  }
 // extract the file being included
-std::string includeFile = includeLine.match(1);
+std::string includeFile =
+  currentline.substr(qstart+1, qend - qstart-1);
 // see if the include matches the regular expression
 if(!this->IncludeFileRegularExpression.find(includeFile))
   {
@@ -205,8 +225,99 @@ protected:
 }
   continue;
   }
+
 // Add this file and all its

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-743-ga3de829

2015-10-20 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  a3de829edbb478a949ae9877e6a1541657869305 (commit)
   via  0f185d838e86a536c2c9200dcb82e735316d6728 (commit)
  from  1bc5bbf165a5d818d9589d5b6599727af47afaa3 (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=a3de829edbb478a949ae9877e6a1541657869305
commit a3de829edbb478a949ae9877e6a1541657869305
Merge: 1bc5bbf 0f185d8
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 18:43:14 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 18:43:14 2015 -0400

Merge topic 'inline-cmMakeDepend-content' into next

0f185d83 fixup! cmMakeDepend: Inline into inheriting class.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f185d838e86a536c2c9200dcb82e735316d6728
commit 0f185d838e86a536c2c9200dcb82e735316d6728
Author: Stephen Kelly 
AuthorDate: Wed Oct 21 00:42:54 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 21 00:42:54 2015 +0200

fixup! cmMakeDepend: Inline into inheriting class.

diff --git a/Source/cmOutputRequiredFilesCommand.cxx 
b/Source/cmOutputRequiredFilesCommand.cxx
index 59dafba..54208ac 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -210,7 +210,8 @@ protected:
   qend = currentline.find('\"', qstart+1);
   }
 // extract the file being included
-std::string includeFile = currentline.substr(qstart+1, qend - 
qstart-1);
+std::string includeFile =
+  currentline.substr(qstart+1, qend - qstart-1);
 // see if the include matches the regular expression
 if(!this->IncludeFileRegularExpression.find(includeFile))
   {
@@ -507,7 +508,8 @@ protected:
   return fp;
   }
 
-for(std::vector::iterator i = 
this->IncludeDirectories.begin();
+for(std::vector::iterator i =
+this->IncludeDirectories.begin();
 i != this->IncludeDirectories.end(); ++i)
   {
   std::string path = *i;

---

Summary of changes:
 Source/cmOutputRequiredFilesCommand.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-741-g1bc5bbf

2015-10-20 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  1bc5bbf165a5d818d9589d5b6599727af47afaa3 (commit)
   via  c6f8df7c86b99f41f30ea8c5968f8394d05082cf (commit)
   via  e9316ead07a15e4eb85a8dd92e1e7d42ae5b6ccf (commit)
   via  69d4ddd992b62c68fe4f6d609a439356d282654d (commit)
   via  3df749af55c04d5b7bb0ee848c6df112178327bc (commit)
   via  3029c27e46a193c6319a3c909f938e6614c2b14f (commit)
  from  c8286a5ff5e2c7843a0ee33376dd3b0032317d48 (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=1bc5bbf165a5d818d9589d5b6599727af47afaa3
commit 1bc5bbf165a5d818d9589d5b6599727af47afaa3
Merge: c8286a5 c6f8df7
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 18:26:56 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 18:26:56 2015 -0400

Merge topic 'inline-cmMakeDepend-content' into next

c6f8df7c cmMakeDepend: Inline into inheriting class.
e9316ead cmMakeDepend: Inline into only user.
69d4ddd9 cmMakeDepend: Inline into header.
3df749af Remove vestigial declarations.
3029c27e cmMakeDepend: Use public cmMakefile API.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6f8df7c86b99f41f30ea8c5968f8394d05082cf
commit c6f8df7c86b99f41f30ea8c5968f8394d05082cf
Author: Stephen Kelly 
AuthorDate: Mon Oct 19 22:14:14 2015 +0200
Commit: Stephen Kelly 
CommitDate: Wed Oct 21 00:26:04 2015 +0200

cmMakeDepend: Inline into inheriting class.

Devirtualize the API.

diff --git a/Source/cmOutputRequiredFilesCommand.cxx 
b/Source/cmOutputRequiredFilesCommand.cxx
index a1500fc..59dafba 100644
--- a/Source/cmOutputRequiredFilesCommand.cxx
+++ b/Source/cmOutputRequiredFilesCommand.cxx
@@ -72,16 +72,13 @@ public:
   }
 };
 
-
-// cmMakeDepend is used to generate dependancy information for
-// the classes in a makefile
-class cmMakeDepend
+class cmLBDepend
 {
 public:
   /**
* Construct the object with verbose turned off.
*/
-  cmMakeDepend()
+  cmLBDepend()
   {
 this->Verbose = false;
 this->IncludeFileRegularExpression.compile("^.*$");
@@ -91,7 +88,7 @@ public:
   /**
* Destructor.
*/
-  virtual ~cmMakeDepend()
+  ~cmLBDepend()
   {
 cmDeleteAll(this->DependInformationMap);
   }
@@ -99,7 +96,7 @@ public:
   /**
* Set the makefile that is used as a source of classes.
*/
-  virtual void SetMakefile(cmMakefile* makefile)
+  void SetMakefile(cmMakefile* makefile)
   {
 this->Makefile = makefile;
 
@@ -153,7 +150,7 @@ public:
   /**
* Add a directory to the search path for include files.
*/
-  virtual void AddSearchPath(const std::string& path)
+  void AddSearchPath(const std::string& path)
   {
 this->IncludeDirectories.push_back(path);
   }
@@ -173,25 +170,47 @@ protected:
   /**
* Compute the depend information for this class.
*/
-  virtual void DependWalk(cmDependInformation* info)
+
+  void DependWalk(cmDependInformation* info)
   {
-cmsys::RegularExpression includeLine
-("^[ \t]*#[ \t]*include[ \t]*[<\"]([^\">]+)[\">]");
 cmsys::ifstream fin(info->FullPath.c_str());
 if(!fin)
   {
-  cmSystemTools::Error("Cannot open ", info->FullPath.c_str());
+  cmSystemTools::Error("error can not open ", info->FullPath.c_str());
   return;
   }
 
-// TODO: Write real read loop (see cmSystemTools::CopyFile).
 std::string line;
-while( cmSystemTools::GetLineFromStream(fin, line) )
+while(cmSystemTools::GetLineFromStream(fin, line))
   {
-  if(includeLine.find(line.c_str()))
+  if(cmHasLiteralPrefix(line.c_str(), "#include"))
 {
+// if it is an include line then create a string class
+std::string currentline = line;
+size_t qstart = currentline.find('\"', 8);
+size_t qend;
+// if a quote is not found look for a <
+if(qstart == std::string::npos)
+  {
+  qstart = currentline.find('<', 8);
+  // if a < is not found then move on
+  if(qstart == std::string::npos)
+{
+cmSystemTools::Error("unknown include directive ",
+ currentline.c_str() );
+continue;
+}
+  else
+{
+qend = currentline.find('>', qstart+1);
+}
+  }
+else
+  {
+  qend = currentline.find('\"', qstart+1);
+  }
 // extract the file being included
-std::string includeFile = includeLine.match(1);
+std::string includeFile = currentline.substr(qstart+1, qend - 
qstart-1);
 // see if the include matches the regular

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-735-gc8286a5

2015-10-20 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  c8286a5ff5e2c7843a0ee33376dd3b0032317d48 (commit)
   via  d6a03b475e023da9b7532a5b8735caec36b5de86 (commit)
  from  03c0c9cc4098108010dc115bbdde4158fe423a40 (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=c8286a5ff5e2c7843a0ee33376dd3b0032317d48
commit c8286a5ff5e2c7843a0ee33376dd3b0032317d48
Merge: 03c0c9c d6a03b4
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 17:41:06 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 17:41:06 2015 -0400

Merge topic 'fix-CMP0054-elseif-warning' into next

d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. 
(#15802)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6a03b475e023da9b7532a5b8735caec36b5de86
commit d6a03b475e023da9b7532a5b8735caec36b5de86
Author: Stephen Kelly 
AuthorDate: Tue Oct 20 19:13:52 2015 +0200
Commit: Stephen Kelly 
CommitDate: Tue Oct 20 23:40:12 2015 +0200

cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)

Commit v3.4.0-rc1~494^2~4 (cmMakefile: Add API for elseif to create
backtrace., 2015-05-29) removed the use of cmMakefileCall to push/pop
execution context in favor of a new way to create backtraces.

However, a call to cmMakefile::GetExecutionContext is still invoked to
issue a contextual CMP0054 warning through cmConditionEvaluator.  As
the elseif is not part of the call stack, this resulted in trying to
access an empty vector.

Avoid the attempt at getting execution context when evaluating elseif by
constructing a context and backtrace on behalf of the cmConditionEvaluator
in all cases.

diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx
index 7874803..5330acd 100644
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@@ -11,9 +11,14 @@
 */
 
 #include "cmConditionEvaluator.h"
+#include "cmOutputConverter.h"
 
-cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile):
+cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile,
+   const cmListFileContext &context,
+   const cmListFileBacktrace& bt):
   Makefile(makefile),
+  ExecutionContext(context),
+  Backtrace(bt),
   Policy12Status(makefile.GetPolicyStatus(cmPolicies::CMP0012)),
   Policy54Status(makefile.GetPolicyStatus(cmPolicies::CMP0054)),
   Policy57Status(makefile.GetPolicyStatus(cmPolicies::CMP0057)),
@@ -98,6 +103,25 @@ bool cmConditionEvaluator::IsTrue(
 errorString, status, true);
 }
 
+cmListFileContext cmConditionEvaluator::GetConditionContext(
+cmMakefile* mf,
+const cmCommandContext& command,
+const std::string& filePath)
+{
+  cmListFileContext context =
+  cmListFileContext::FromCommandContext(
+command,
+filePath);
+
+  if(!mf->GetCMakeInstance()->GetIsInTryCompile())
+{
+cmOutputConverter converter(mf->GetStateSnapshot());
+context.FilePath = converter.Convert(context.FilePath,
+ cmOutputConverter::HOME);
+}
+  return context;
+}
+
 //=
 const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
   cmExpandedCommandArgument const& argument) const
@@ -113,7 +137,8 @@ const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
 
   if(def && argument.WasQuoted() && this->Policy54Status == cmPolicies::WARN)
 {
-if(!this->Makefile.HasCMP0054AlreadyBeenReported())
+if(!this->Makefile.HasCMP0054AlreadyBeenReported(
+ this->ExecutionContext))
   {
   std::ostringstream e;
   e << (cmPolicies::GetPolicyWarning(cmPolicies::CMP0054)) << "\n";
@@ -122,7 +147,9 @@ const char* cmConditionEvaluator::GetDefinitionIfUnquoted(
 "when the policy is set to NEW.  "
 "Since the policy is not set the OLD behavior will be used.";
 
-  this->Makefile.IssueMessage(cmake::AUTHOR_WARNING, e.str());
+  this->Makefile.GetCMakeInstance()
+  ->IssueMessage(cmake::AUTHOR_WARNING, e.str(),
+ this->Backtrace);
   }
 }
 
@@ -159,7 +186,8 @@ bool cmConditionEvaluator::IsKeyword(std::string const& 
keyword,
   if(isKeyword && argument.WasQuoted() &&
 this->Policy54Status == cmPolicies::WARN)
 {
-if(!this->Makefile.HasCMP0054AlreadyBeenReported())
+if(!this->Makefile.HasCMP0054AlreadyBeenReported(
+ this->ExecutionContext

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-733-g03c0c9c

2015-10-20 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  03c0c9cc4098108010dc115bbdde4158fe423a40 (commit)
   via  18f848549bcbe4de8bfee66762304c2d241965fb (commit)
   via  b004a2d4798afd1747e8f52f52a7184890eb606c (commit)
   via  23520f1dca774bdb9aac3b0e264447d822d716de (commit)
   via  0b75f567d2ceb3de072ce50cfc9609a1760c35ac (commit)
   via  eefcb1e9bbcc3c5c6bfa140531d3ab5bb03f8961 (commit)
  from  b440006bcad4df6916b90b7505352cc866bf8b96 (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=03c0c9cc4098108010dc115bbdde4158fe423a40
commit 03c0c9cc4098108010dc115bbdde4158fe423a40
Merge: b440006 18f8485
Author: Gregor Jasny 
AuthorDate: Tue Oct 20 16:50:12 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 16:50:12 2015 -0400

Merge topic 'xcode-optimization-flags' into next

18f84854 Xcode: Add test case for bug report (#15794)
b004a2d4 fixup! Add test case for Xcode optimisation level settings (#15794)
23520f1d Use regex itself to check for white spaces around flag
0b75f567 Xcode: Use regular expression to extract all optimisation flags 
(#15794)
eefcb1e9 Add test case for Xcode optimisation level settings (#15794)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18f848549bcbe4de8bfee66762304c2d241965fb
commit 18f848549bcbe4de8bfee66762304c2d241965fb
Author: Gregor Jasny 
AuthorDate: Tue Oct 20 22:01:29 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Oct 20 22:01:29 2015 +0200

Xcode: Add test case for bug report (#15794)

diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake 
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index b716f0d..a8c6816 100644
--- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
+++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
@@ -5,6 +5,7 @@ run_cmake(XcodeAttributeGenex)
 run_cmake(XcodeAttributeGenexError)
 run_cmake(XcodeObjectNeedsQuote)
 run_cmake(XcodeOptimizationFlags)
+run_cmake(XcodePreserveObjcFlag)
 if (NOT XCODE_VERSION VERSION_LESS 6)
   run_cmake(XcodePlatformFrameworks)
 endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake 
b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake
new file mode 100644
index 000..332906f
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake
@@ -0,0 +1,7 @@
+set(expect "-ObjC")
+file(STRINGS 
${RunCMake_TEST_BINARY_DIR}/XcodePreserveObjcFlag.xcodeproj/project.pbxproj 
actual
+ REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;" LIMIT_COUNT 1)
+if(NOT "${actual}" MATCHES "${expect}")
+  message(SEND_ERROR "The actual project contains the line:\n ${actual}\n"
+"which does not match expected regex:\n ${expect}\n")
+endif()
diff --git a/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake 
b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake
new file mode 100644
index 000..64db633
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake
@@ -0,0 +1,6 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported 
configuration types")
+
+project(XcodePreserveObjcFlag CXX)
+
+add_library(foo STATIC foo.cpp)
+set_target_properties(foo PROPERTIES COMPILE_OPTIONS -ObjC)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b004a2d4798afd1747e8f52f52a7184890eb606c
commit b004a2d4798afd1747e8f52f52a7184890eb606c
Author: Gregor Jasny 
AuthorDate: Tue Oct 20 21:59:42 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Oct 20 21:59:42 2015 +0200

fixup! Add test case for Xcode optimisation level settings (#15794)

diff --git a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake 
b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
index 53da440..e14bf80 100644
--- a/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
+++ b/Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake
@@ -4,8 +4,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "")
 
 project(XcodeOptimizationFlags CXX)
 
-message(STATUS "NONE ${CMAKE_CXX_FLAGS} CXX ${CMAKE_CXX_FLAGS_RELEASE}")
-
 add_library(fooO1 STATIC foo.cpp)
 set_target_properties(fooO1 PROPERTIES COMPILE_OPTIONS -O1)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23520f1dca774bdb9aac3b0e264447d822d716de
commit 23520f1dca774bdb9aac3b0e264447d822d716de
Author: Gregor Jasny 
AuthorDate: Tue Oct 20 21:39:45 2015 +0200
Commit: Gregor Jasny 
CommitDate: Tue Oct 20 21:39:45 2015 +0200

Use regex itself to check for white spaces around flag

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index 2a838e6..0e3af88 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlo

[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-727-gb440006

2015-10-20 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  b440006bcad4df6916b90b7505352cc866bf8b96 (commit)
   via  123de1914c7e7d53d1e295c73994b2780041b8fc (commit)
  from  1fe5b927e070f42067487b7dd0c3cac720d879bf (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=b440006bcad4df6916b90b7505352cc866bf8b96
commit b440006bcad4df6916b90b7505352cc866bf8b96
Merge: 1fe5b92 123de19
Author: Brad King 
AuthorDate: Tue Oct 20 14:43:52 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 14:43:52 2015 -0400

Merge topic 'ninja-refactor-deptype-selection' into next

123de191 Ninja: Refactor selection of 'deps = ' value for MS-compatible 
toolchains


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=123de1914c7e7d53d1e295c73994b2780041b8fc
commit 123de1914c7e7d53d1e295c73994b2780041b8fc
Author: Brad King 
AuthorDate: Tue Oct 20 13:52:12 2015 -0400
Commit: Brad King 
CommitDate: Tue Oct 20 14:14:20 2015 -0400

Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains

Set variables in the platform information modules to tell the Ninja
generator what deps type to use instead of hard-coding conditions in the
generator itself.

diff --git a/Modules/Platform/Windows-MSVC.cmake 
b/Modules/Platform/Windows-MSVC.cmake
index b421b0d..a61413a 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -302,6 +302,7 @@ macro(__windows_compiler_msvc lang)
   set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
   set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD /O1 /Ob1 /D NDEBUG")
   set(CMAKE_${lang}_LINKER_SUPPORTS_PDB ON)
+  set(CMAKE_NINJA_DEPTYPE_${lang} msvc)
 
   if(NOT CMAKE_RC_COMPILER_INIT)
 set(CMAKE_RC_COMPILER_INIT rc)
@@ -311,4 +312,5 @@ macro(__windows_compiler_msvc lang)
   endif()
 
   enable_language(RC)
+  set(CMAKE_NINJA_CMCLDEPS_RC 1)
 endmacro()
diff --git a/Source/cmNinjaTargetGenerator.cxx 
b/Source/cmNinjaTargetGenerator.cxx
index cb1122c..b018005 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -148,17 +148,9 @@ void cmNinjaTargetGenerator::AddIncludeFlags(std::string& 
languageFlags,
 
 bool cmNinjaTargetGenerator::NeedDepTypeMSVC(const std::string& lang) const
 {
-  if (lang == "C" || lang == "CXX")
-{
-cmMakefile* mf = this->GetMakefile();
-return (
-  strcmp(mf->GetSafeDefinition("CMAKE_C_COMPILER_ID"), "MSVC") == 0 ||
-  strcmp(mf->GetSafeDefinition("CMAKE_CXX_COMPILER_ID"), "MSVC") == 0 ||
-  strcmp(mf->GetSafeDefinition("CMAKE_C_SIMULATE_ID"), "MSVC") == 0 ||
-  strcmp(mf->GetSafeDefinition("CMAKE_CXX_SIMULATE_ID"), "MSVC") == 0
-  );
-}
-  return false;
+  return strcmp(
+this->GetMakefile()->GetSafeDefinition("CMAKE_NINJA_DEPTYPE_" + lang),
+"msvc") == 0;
 }
 
 // TODO: Refactor with
@@ -359,7 +351,7 @@ cmNinjaTargetGenerator
 depfile = "";
 flags += " /showIncludes";
 }
-  else if (lang == "RC" && this->NeedDepTypeMSVC("C"))
+  else if (mf->IsOn("CMAKE_NINJA_CMCLDEPS_"+lang))
 {
 // For the MS resource compiler we need cmcldeps, but skip dependencies
 // for source-file try_compile cases because they are always fresh.

---

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |2 ++
 Source/cmNinjaTargetGenerator.cxx   |   16 
 2 files changed, 6 insertions(+), 12 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.4.0-rc1-725-g1fe5b92

2015-10-20 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  1fe5b927e070f42067487b7dd0c3cac720d879bf (commit)
   via  9afbb733ec2a55424e6c25c6afa7fdd14219d6b1 (commit)
   via  5ec8064b76aca89b6e0274e53c272f298655b992 (commit)
   via  1fcc01f2074cc5fd56489ccab90457b51082e10e (commit)
   via  fca389e78ca8d5fe377a4116dedf8b9307126380 (commit)
   via  693141c40e87a77f0a0258e21235197d421c26a5 (commit)
  from  846d838c55836073bb97d4589a20885af9328079 (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=1fe5b927e070f42067487b7dd0c3cac720d879bf
commit 1fe5b927e070f42067487b7dd0c3cac720d879bf
Merge: 846d838 9afbb73
Author: Brad King 
AuthorDate: Tue Oct 20 11:17:00 2015 -0400
Commit: Brad King 
CommitDate: Tue Oct 20 11:17:00 2015 -0400

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, next, updated. v3.4.0-rc1-719-g846d838

2015-10-20 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  846d838c55836073bb97d4589a20885af9328079 (commit)
   via  3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f (commit)
  from  e17e6c2fe24f89c5fab89484bb3d37558eec949f (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=846d838c55836073bb97d4589a20885af9328079
commit 846d838c55836073bb97d4589a20885af9328079
Merge: e17e6c2 3cd2e0e
Author: Brad King 
AuthorDate: Tue Oct 20 11:15:04 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 11:15:04 2015 -0400

Merge topic 'fix_delphi_coverage' into next

3cd2e0e2 Tests: Fix DelphiCoverage test file selection


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f
commit 3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f
Author: Joseph Snyder 
AuthorDate: Wed Aug 13 18:03:53 2014 -0400
Commit: Brad King 
CommitDate: Tue Oct 20 11:13:25 2015 -0400

Tests: Fix DelphiCoverage test file selection

The HTML file for the Delphi Code coverage was being found by the
Dashboard coverage run of CMake itself.  Switch it to be a configured
file to eliminate this extra reading.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 3f28c25..ae61bca 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2587,8 +2587,9 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P 
${CMake_SOURCE_DIR}/Utilities/Release
  "${CMake_BINARY_DIR}/Testing/DelphiCoverage/DartConfiguration.tcl")
   file(COPY "${CMake_SOURCE_DIR}/Tests/DelphiCoverage/src"
 DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
-  file(COPY 
"${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html"
-DESTINATION "${CMake_BINARY_DIR}/Testing/DelphiCoverage")
+  configure_file(
+"${CMake_SOURCE_DIR}/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in"
+"${CMake_BINARY_DIR}/Testing/DelphiCoverage/UTCovTest(UTCovTest.pas).html")
   add_test(NAME CTestDelphiCoverage
 COMMAND cmake -E chdir
 ${CMake_BINARY_DIR}/Testing/DelphiCoverage
diff --git a/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html 
b/Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in
similarity index 100%
rename from Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html
rename to Tests/DelphiCoverage/UTCovTest(UTCovTest.pas).html.in

---

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.4.0-rc1-303-g9afbb73

2015-10-20 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  9afbb733ec2a55424e6c25c6afa7fdd14219d6b1 (commit)
   via  d8f8940bc68f09e382320d1ffe36947ba880ae65 (commit)
   via  7550879f570502f31aeafbd48f04bafd17234696 (commit)
   via  88d10d55ac68f2251a549cf09292af8a1fb66ba3 (commit)
   via  b5f5de70c0b754010f151cde75783a2cc62db835 (commit)
   via  8e20ea6ef2258867bd6554536fa7b914f266df96 (commit)
   via  a527abf0995fc1bdd45afdb20e80b728dd0ef045 (commit)
   via  eb3be7d68851ce87354f6bd90e0be3a670d22d56 (commit)
   via  d231c31b98eb80929d9aabf8e606abde39fc08f4 (commit)
   via  e6661282436d7901617d2f96d9acf9d4cb7db9d5 (commit)
   via  2b9cc1e24871c6b527900e119640ef0adf706f0d (commit)
   via  97062ac268d1bcc62a528aea2e22a7dd6f6efa8f (commit)
   via  6a72b3c84e016d7e540aa3d9b079200b3fb52ab7 (commit)
   via  1293c1561a58b2f8b0bd4ec05bb249fc36f487ac (commit)
   via  381e7afd363d64c72b83e69fd6c6cad5fc3eefb4 (commit)
   via  65911cae4dd5a81f23a59bf9187b95bda3168fe9 (commit)
   via  37ab74a607a021567a0a1e2c7df43da33d32d5ec (commit)
   via  31c4aee75a18b11d86a364d01fdae3250200866d (commit)
   via  3e8ef6427393546c77da1b74234311d3b60edd98 (commit)
   via  cfb2f7508af637c9c35758fbd5dac6c8cb679bdb (commit)
   via  b857f0d84b539056bc6a810161eb22e9b9baca43 (commit)
   via  ed09f3b292bee34e8b30204c93ef5596a3124d00 (commit)
   via  beff29f0d4bf1ffface0e6833f29f2f04ceccf0b (commit)
   via  12e4790a0b40d8176940f855f7f6c9cfe6c39f9f (commit)
   via  14272277205ac7927a4c13b628ce411538f7b17c (commit)
   via  8f363d6771dfa792d606978e1e406229637078f6 (commit)
   via  5794dbc301ace0041c5fc50096cc5331e8ba3c34 (commit)
   via  a892b285f8c621ba50f45f5c4218980c911fd1b6 (commit)
   via  cb8c728f17a61732064280ddb98203cb277e5a3c (commit)
   via  fb4fca0b5efabdf061bd256ed9d35edae6f42b9d (commit)
   via  50fb2ad6463c500fde44c000c777aa3ac1cffc7e (commit)
   via  d233030f5bcfe2509b82433f7df6383cd301e34e (commit)
   via  0ebe2bbf4ae7f19b10f8374313b2bbd6fcd6c3da (commit)
   via  60bd9f9c92faae368fab1c44cf81b489c6a875cb (commit)
   via  82a6eaf4d0381f0e3236dbd067fe853653bbe6b5 (commit)
   via  8aaed08696a7444b80b6319e2b5af320ee589658 (commit)
   via  393654bf49f2c8d86e9ec88fc3c8322497432aea (commit)
  from  5ec8064b76aca89b6e0274e53c272f298655b992 (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=9afbb733ec2a55424e6c25c6afa7fdd14219d6b1
commit 9afbb733ec2a55424e6c25c6afa7fdd14219d6b1
Merge: 5ec8064 d8f8940
Author: Brad King 
AuthorDate: Tue Oct 20 11:16:45 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 11:16:45 2015 -0400

Merge topic 'use-generator-target'

d8f8940b cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.
7550879f cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.
88d10d55 cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget.
b5f5de70 cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget.
8e20ea6e cmGeneratorTarget: Move IsLinkable from cmTarget.
a527abf0 Xcode: Port internal API to cmGeneratorTarget.
eb3be7d6 cmGeneratorTarget: Move GetExportName from cmTarget.
d231c31b Export: Port internal API to cmGeneratorTarget.
e6661282 Export: Port internal utility to cmGeneratorTarget.
2b9cc1e2 Export: Port some API to cmGlobalGenerator.
97062ac2 cmInstallTargetGenerator: Port GetInstallFilename to 
cmGeneratorTarget.
6a72b3c8 Export: Port interface to cmGeneratorTarget.
1293c156 cmExportTryCompileFileGenerator: Port to cmGeneratorTarget.
381e7afd cmExportSet: Store a cmGeneratorTarget.
65911cae cmGlobalGenerator: Compute export() related classes early.
37ab74a6 cmLocalGenerator: Port PList handling to cmGeneratorTarget.
...


---

Summary of changes:
 Source/cmCommonTargetGenerator.cxx |   16 +-
 Source/cmComputeLinkInformation.cxx|4 +-
 Source/cmComputeTargetDepends.cxx  |2 +-
 Source/cmCoreTryCompile.cxx|7 +-
 Source/cmCustomCommandGenerator.cxx|2 +-
 Source/cmExportBuildFileGenerator.cxx  |   58 ++-
 Source/cmExportBuildFileGenerator.h|   11 +-
 Source/cmExportFileGenerator.cxx   |   69 ++-
 Source/cmExportFileGenerator.h |   33 +-
 Source/cmExportInstallFileGenerator.cxx|   63 ++-
 Source/cmExportInstallFileGenerator.h  |   11 +-
 Source/cmExportSet.cxx |

[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-261-g1fcc01f

2015-10-20 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  1fcc01f2074cc5fd56489ccab90457b51082e10e (commit)
   via  3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f (commit)
  from  fca389e78ca8d5fe377a4116dedf8b9307126380 (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=1fcc01f2074cc5fd56489ccab90457b51082e10e
commit 1fcc01f2074cc5fd56489ccab90457b51082e10e
Merge: fca389e 3cd2e0e
Author: Brad King 
AuthorDate: Tue Oct 20 11:16:40 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 11:16:40 2015 -0400

Merge topic 'fix_delphi_coverage'

3cd2e0e2 Tests: Fix DelphiCoverage test file selection


---

Summary of changes:
 Tests/CMakeLists.txt  |5 +++--
 ...vTest(UTCovTest.pas).html => UTCovTest(UTCovTest.pas).html.in} |0
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename Tests/DelphiCoverage/{UTCovTest(UTCovTest.pas).html => 
UTCovTest(UTCovTest.pas).html.in} (100%)


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

[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-266-g5ec8064

2015-10-20 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  5ec8064b76aca89b6e0274e53c272f298655b992 (commit)
   via  4565a2e1c2643fcd1b40f4a041564fc4ab60c17c (commit)
   via  db3d85059c2e48b1a4da99230098f63d04dd4e93 (commit)
   via  c26ff8a90b985f7189aa114b0bcac35b2f476b55 (commit)
   via  30710b8d32344a7a9acf944f97fc947fd491cd65 (commit)
  from  1fcc01f2074cc5fd56489ccab90457b51082e10e (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=5ec8064b76aca89b6e0274e53c272f298655b992
commit 5ec8064b76aca89b6e0274e53c272f298655b992
Merge: 1fcc01f 4565a2e
Author: Brad King 
AuthorDate: Tue Oct 20 11:16:42 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 11:16:42 2015 -0400

Merge topic 'FindFLEX-DEFINES_FILE'

4565a2e1 Help: Add notes for topic 'FindFLEX-DEFINES_FILE'
db3d8505 FindFLEX: Add a DEFINES_FILE option to specify flex-generated 
header (#15781)
c26ff8a9 FindFLEX: Fix typo in ADD_FLEX_BISON_DEPENDENCY errors
30710b8d FindFLEX: Use CMAKE_PARSE_ARGUMENTS to parse arguments


---

Summary of changes:
 Help/release/dev/FindFLEX-DEFINES_FILE.rst |6 ++
 Modules/FindFLEX.cmake |   87 +++-
 2 files changed, 65 insertions(+), 28 deletions(-)
 create mode 100644 Help/release/dev/FindFLEX-DEFINES_FILE.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.4.0-rc1-259-gfca389e

2015-10-20 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  fca389e78ca8d5fe377a4116dedf8b9307126380 (commit)
   via  c6d75294b2827a7f24baed4814046d9d0bd6a61d (commit)
   via  9c6a7203fb0c6034771011a8ac58ae447726b919 (commit)
  from  693141c40e87a77f0a0258e21235197d421c26a5 (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=fca389e78ca8d5fe377a4116dedf8b9307126380
commit fca389e78ca8d5fe377a4116dedf8b9307126380
Merge: 693141c c6d7529
Author: Brad King 
AuthorDate: Tue Oct 20 11:16:38 2015 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Oct 20 11:16:38 2015 -0400

Merge topic 'update-kwsys'

c6d75294 Merge branch 'upstream-kwsys' into update-kwsys
9c6a7203 KWSys 2015-10-16 (a7e5360f)


---

Summary of changes:
 Source/kwsys/Terminal.c |   11 +++
 1 file changed, 11 insertions(+)


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