[Cmake-commits] CMake branch, master, updated. v3.4.0-rc2-315-g9e5f253
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 9e5f253f8dba871d7cdd966aca88af92bd8d14a6 (commit) from 56cec75058b1980ead58ddda0c371a783547acec (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=9e5f253f8dba871d7cdd966aca88af92bd8d14a6 commit 9e5f253f8dba871d7cdd966aca88af92bd8d14a6 Author: Kitware Robot AuthorDate: Thu Oct 22 00:01:08 2015 -0400 Commit: Kitware Robot CommitDate: Thu Oct 22 00:01:08 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d1132d2..fd17910 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 20151021) +set(CMake_VERSION_PATCH 20151022) #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-rc2-828-g9d230d9
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 9d230d94b91625ed2edaae73649b0371013cf54a (commit)
via 3dce55492f97de80f455a53d5bce4178f2ae11a7 (commit)
from 7b38cda3bc92ab002b19020a1c201552d039a6fc (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=9d230d94b91625ed2edaae73649b0371013cf54a
commit 9d230d94b91625ed2edaae73649b0371013cf54a
Merge: 7b38cda 3dce554
Author: Stephen Kelly
AuthorDate: Wed Oct 21 17:20:44 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 17:20:44 2015 -0400
Merge topic 'use-generator-target' into next
3dce5549 fixup! GHS: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dce55492f97de80f455a53d5bce4178f2ae11a7
commit 3dce55492f97de80f455a53d5bce4178f2ae11a7
Author: Stephen Kelly
AuthorDate: Wed Oct 21 23:19:29 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 23:20:02 2015 +0200
fixup! GHS: Port to cmGeneratorTarget.
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx
b/Source/cmGlobalGhsMultiGenerator.cxx
index e260049..1bcbd26 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -487,7 +487,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
tgtsI != tgts.end(); ++tgtsI)
{
const cmGeneratorTarget *tgt = *tgtsI;
-if (IsTgtForBuild(tgt->Target))
+if (IsTgtForBuild(tgt))
{
char const *rawFolderName = tgt->GetProperty("FOLDER");
if (NULL == rawFolderName)
@@ -504,7 +504,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles(
GhsMultiGpj::PROJECT);
}
std::vector splitPath = cmSystemTools::SplitString(
-cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target));
+cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt));
std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" +
splitPath.back());
*this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile
---
Summary of changes:
Source/cmGlobalGhsMultiGenerator.cxx |4 ++--
1 file 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-rc2-826-g7b38cda
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 7b38cda3bc92ab002b19020a1c201552d039a6fc (commit)
via acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7 (commit)
via 9c9072439af6d8f16ec407789e8a1223dd7c7564 (commit)
from c3d33f3b0d9341d1a5927382ff58e6ba4baa330f (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=7b38cda3bc92ab002b19020a1c201552d039a6fc
commit 7b38cda3bc92ab002b19020a1c201552d039a6fc
Merge: c3d33f3 acf26f0
Author: Stephen Kelly
AuthorDate: Wed Oct 21 17:17:45 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 17:17:45 2015 -0400
Merge topic 'use-generator-target' into next
acf26f03 fixup! Port to GetGeneratorTargets.
9c907243 fixup! cmLocalGenerator: Store a vector of generator targets.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7
commit acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7
Author: Stephen Kelly
AuthorDate: Wed Oct 21 23:17:22 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 23:17:22 2015 +0200
fixup! Port to GetGeneratorTargets.
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 0f39ddb..4895698 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -129,7 +129,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
for(std::vector::iterator l = tgts.begin();
l != tgts.end(); l++)
{
-cmTarget& tgt = (*l)->Target;
+cmTarget& tgt = *(*l)->Target;
if(tgt.GetType() == cmState::GLOBAL_TARGET)
{
std::vector no_depends;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c9072439af6d8f16ec407789e8a1223dd7c7564
commit 9c9072439af6d8f16ec407789e8a1223dd7c7564
Author: Stephen Kelly
AuthorDate: Wed Oct 21 23:16:06 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 23:16:06 2015 +0200
fixup! cmLocalGenerator: Store a vector of generator targets.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 8ab2262..4d431f6 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -87,7 +87,7 @@ void cmGlobalVisualStudioGenerator::AddExtraIDETargets()
"Build all projects");
cmGeneratorTarget* gt = new cmGeneratorTarget(allBuild, gen[0]);
- gen[0]->AddGeneratorTarget(allBuild, gt);
+ gen[0]->AddGeneratorTarget(gt);
this->AddGeneratorTarget(allBuild, gt);
#if 0
---
Summary of changes:
Source/cmGlobalVisualStudioGenerator.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 annotated tag, v3.4.0-rc2, created. v3.4.0-rc2
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 annotated tag, v3.4.0-rc2 has been created at 2b848180d46b682ad1074f740a2b01c80d4fca4a (tag) tagging 498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit) replaces v3.4.0-rc1 tagged by Brad King on Wed Oct 21 13:03:40 2015 -0400 - Log - CMake 3.4.0-rc2 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJWJ8VsAAoJEC0s7xA0khaE040QAIJ49s2+UQqmbucIfhcRr8yS pWR0OYULTOKjTGnpiSPkJEpiDYNkV86o3dl8ILAyLl10O5ic3i8Z+5pkDiyt2eN4 RkIQC05dEVCflpjx7F+xbpalAgMti01PQy4nBoSzR4NM/K00r0LWz6lo91SKDBUl KdEz7mrV9NNtG+V1Wh+JorW/SYTlAB9CHx5A7Oeof2ANLEiFxpJgNtg9HJwmwWSO rNek52t0C2vjU+Vd390XOSrvIM2ofRWfBirncXnndRv29oRSo/uCmQyjTISD08uF sncifJw6ojBvdGEaC6s9/CdaetBksVlRNoeL5sNZr72qmH1qicEHq+yRDvYzuBkK N2sgJPEjLm19gol2c5hfiTGmsn5j8y8rMqX7esixPHFq+/jz8ifoOzvUhrL33Cjh wzvf9+5ze5zXZ/RyQ9C/s3QY/rGp84GyGshGQdn0ydlVMi9kj3cfkVY7ZtJNBWj2 OaNmdxonZNG1gql+X+36aJ77NdzBro3/8cj/eyF/22FscDZiywoE2DkrfGU86ChJ Oy4n8EGVJnNyUauvx+/TB2QmJ3DuKudZ6JpeSugPMtxSllkDUj72LPMyDc73pccC 5i09nV/sVDzV7isSu839iceA+MCsW1TmmPzsD3KHsKUmeAjmfQ7f89hmJ90zTQjS KPIulVu6y0lad7zbP7mt =dEA6 -END PGP SIGNATURE- Brad King (18): Revert topic 'compiler-features-solaris' Merge branch 'ctest-submit-content-type' into release Merge branch 'revert-compiler-features-solaris' into release Merge branch 'doc-clarify-shared-lib' into release Merge branch 'emacs-mode-fix-accidental-indentation' into release Merge branch 'cpack-wix-typos' into release Merge branch 'FindPostgreSQL-v9.5' into release Merge branch 'xcode-adjust-deployment-to-host-version' into release Help: Add release note about compile rule placeholder changes (#15787) Merge branch 'doc-INCLUDES-relnote' into release ExternalProject: Fix Git version report in error message (#15791) ExternalProject: Always use CMake builtin FindGit (#15791) Merge branch 'ExternalProject-fix-git-version' into release Help: Document add_test expectations of test command (#15798) Merge branch 'doc-add_test-requirements' into release Merge branch 'doc-file-GLOB-no-order' into release Merge branch 'fix-CMP0054-elseif-warning' into release CMake 3.4.0-rc2 Derek Bruening (1): CTest: Set Content-Type header for http file upload (#15774) Gregor Jasny (1): Xcode: Adjust deployment target SDK version to host version James Johnston (1): Help: Document that SHARED libraries must export a symbol (#15775) Kevin Burge (1): cmake-mode.el: treat keywords as symbols Kevin Wojniak (1): CPackWIX: fix typos in documentation Ruslan Baratov (1): Help: Document that file(GLOB*) order is undefined Stephen Kelly (1): cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802) Tamar Kranenburg (1): FindPostgreSQL: Search for version 9.5 --- 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-849-gc3d33f3
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 c3d33f3b0d9341d1a5927382ff58e6ba4baa330f (commit)
via ba75619be0d91624d2cc2451a225bb31d187be65 (commit)
via a991ddfd46c94f2743267ad572fab75936d34a10 (commit)
via 92abc662014dc135ea5af612861373c67eb94734 (commit)
from 464c0314e74dda86d3812e7022d88f516258dbf6 (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=c3d33f3b0d9341d1a5927382ff58e6ba4baa330f
commit c3d33f3b0d9341d1a5927382ff58e6ba4baa330f
Merge: 464c031 ba75619
Author: Stephen Kelly
AuthorDate: Wed Oct 21 16:03:20 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 16:03:20 2015 -0400
Merge topic 'use-generator-target' into next
ba75619b Graphviz: Port to cmGeneratorTarget.
a991ddfd C::B: Port API to cmGeneratorTarget.
92abc662 GHS: Port to cmGeneratorTarget.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba75619be0d91624d2cc2451a225bb31d187be65
commit ba75619be0d91624d2cc2451a225bb31d187be65
Author: Stephen Kelly
AuthorDate: Wed Oct 21 21:49:41 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 22:01:30 2015 +0200
Graphviz: Port to cmGeneratorTarget.
diff --git a/Source/cmGraphVizWriter.cxx b/Source/cmGraphVizWriter.cxx
index cc36c62..a63b6e3 100644
--- a/Source/cmGraphVizWriter.cxx
+++ b/Source/cmGraphVizWriter.cxx
@@ -17,7 +17,7 @@
-static const char* getShapeForTarget(const cmTarget* target)
+static const char* getShapeForTarget(const cmGeneratorTarget* target)
{
if (!target)
{
@@ -163,7 +163,7 @@ void cmGraphVizWriter::WriteTargetDependersFiles(const
char* fileName)
this->CollectTargetsAndLibs();
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -214,7 +214,7 @@ void cmGraphVizWriter::WritePerTargetFiles(const char*
fileName)
this->CollectTargetsAndLibs();
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -268,7 +268,7 @@ void cmGraphVizWriter::WriteGlobalFile(const char* fileName)
std::set insertedConnections;
std::set insertedNodes;
- for(std::map::const_iterator ptrIt =
+ for(std::map::const_iterator ptrIt =
this->TargetPtrs.begin();
ptrIt != this->TargetPtrs.end();
++ptrIt)
@@ -308,8 +308,8 @@ void cmGraphVizWriter::WriteConnections(const std::string&
targetName,
std::set& insertedConnections,
cmGeneratedFileStream& str) const
{
- std::map::const_iterator targetPtrIt =
- this->TargetPtrs.find(targetName);
+ std::map::const_iterator targetPtrIt
+ = this->TargetPtrs.find(targetName);
if (targetPtrIt == this->TargetPtrs.end()) // not found at all
{
@@ -327,7 +327,7 @@ void cmGraphVizWriter::WriteConnections(const std::string&
targetName,
std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
const cmTarget::LinkLibraryVectorType* ll =
-&(targetPtrIt->second->GetOriginalLinkLibraries());
+ &(targetPtrIt->second->Target->GetOriginalLinkLibraries());
for (cmTarget::LinkLibraryVectorType::const_iterator llit = ll->begin();
llit != ll->end();
@@ -367,8 +367,8 @@ void cmGraphVizWriter::WriteDependerConnections(const
std::string& targetName,
std::set& insertedConnections,
cmGeneratedFileStream& str) const
{
- std::map::const_iterator targetPtrIt =
- this->TargetPtrs.find(targetName);
+ std::map::const_iterator targetPtrIt
+ = this->TargetPtrs.find(targetName);
if (targetPtrIt == this->TargetPtrs.end()) // not found at all
{
@@ -386,8 +386,8 @@ void cmGraphVizWriter::WriteDependerConnections(const
std::string& targetName,
std::string myNodeName = this->TargetNamesNodes.find(targetName)->second;
// now search who links against me
- for(std::map::const_iterator dependerIt =
- this->TargetPtrs.begin();
+ for(std::map::const_iterator
+ dependerIt = this->TargetPtrs.begin();
dependerIt != this->TargetPtrs.end();
++dependerIt)
{
@@ -404,7 +404,7 @
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-834-ga52e938
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 a52e9382ed912858423b4683879109900376859b (commit)
via a013d46b49596bccabc9d5741499230ca015ef96 (commit)
from 3385d860ae497fdf9b1a52c7701ec6013ea61c16 (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=a52e9382ed912858423b4683879109900376859b
commit a52e9382ed912858423b4683879109900376859b
Merge: 3385d86 a013d46
Author: Stephen Kelly
AuthorDate: Wed Oct 21 15:58:06 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 15:58:06 2015 -0400
Merge topic 'use-generator-target' into next
a013d46b fixup! Port to GetGeneratorTargets.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a013d46b49596bccabc9d5741499230ca015ef96
commit a013d46b49596bccabc9d5741499230ca015ef96
Author: Stephen Kelly
AuthorDate: Wed Oct 21 21:57:40 2015 +0200
Commit: Stephen Kelly
CommitDate: Wed Oct 21 21:57:40 2015 +0200
fixup! Port to GetGeneratorTargets.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 1d4b36c..8ab2262 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -379,7 +379,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
for(std::vector::iterator ti = targets.begin();
ti != targets.end(); ++ti)
{
-this->ComputeVSTargetDepends((*ti)->Target);
+this->ComputeVSTargetDepends(*(*ti)->Target);
}
}
}
diff --git a/Source/cmLocalVisualStudio10Generator.cxx
b/Source/cmLocalVisualStudio10Generator.cxx
index c18fc16..c9d53fe 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -83,9 +83,9 @@ void cmLocalVisualStudio10Generator::Generate()
continue;
}
if(static_cast(this->GlobalGenerator)
- ->TargetIsFortranOnly((*l)->Target))
+ ->TargetIsFortranOnly(*(*l)->Target))
{
- this->CreateSingleVCProj((*l)->GetName().c_str(),(*l)->Target);
+ this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
}
else
{
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Generator.cxx
index 76ca5b1..773e555 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
if (!cmSystemTools::IsOn(suppRegenRule))
{
- this->AddDSPBuildRule((*l)->Target);
+ this->AddDSPBuildRule(*(*l)->Target);
}
}
}
@@ -133,21 +133,21 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
case cmState::STATIC_LIBRARY:
case cmState::OBJECT_LIBRARY:
this->SetBuildType(STATIC_LIBRARY,
- (*l)->GetName().c_str(), (*l)->Target);
+ (*l)->GetName().c_str(), *(*l)->Target);
break;
case cmState::SHARED_LIBRARY:
case cmState::MODULE_LIBRARY:
this->SetBuildType(DLL,
- (*l)->GetName().c_str(), (*l)->Target);
+ (*l)->GetName().c_str(), *(*l)->Target);
break;
case cmState::EXECUTABLE:
this->SetBuildType(EXECUTABLE,
- (*l)->GetName().c_str(), (*l)->Target);
+ (*l)->GetName().c_str(), *(*l)->Target);
break;
case cmState::UTILITY:
case cmState::GLOBAL_TARGET:
this->SetBuildType(UTILITY,
- (*l)->GetName().c_str(), (*l)->Target);
+ (*l)->GetName().c_str(), *(*l)->Target);
break;
case cmState::INTERFACE_LIBRARY:
continue;
@@ -173,7 +173,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
cmSystemTools::Error("Error creating directory: ", dir.c_str());
}
}
- this->CreateSingleDSP((*l)->GetName().c_str(), (*l)->Target);
+ this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
}
}
}
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 19f9178..0f39ddb 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -187,7 +187,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
// so don't build a projectfile for it
if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
{
- this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
+
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-816-gedf57f3
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 edf57f39262a38c17ba78501ebda5ac7eb23fe4e (commit) via bae0e9c394efd50193f468f5bfd9e66744d8dbc3 (commit) via 000f68c3e015fffdab01f3e9768fa4d9f28f4df2 (commit) from 8ab1833c2ad99fa882b7aa85ac87ded78c580576 (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=edf57f39262a38c17ba78501ebda5ac7eb23fe4e commit edf57f39262a38c17ba78501ebda5ac7eb23fe4e Merge: 8ab1833 bae0e9c Author: Brad King AuthorDate: Wed Oct 21 14:35:17 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 14:35:17 2015 -0400 Merge topic 'update-libarchive' into next bae0e9c3 libarchive: Use CommonCrypto on OS X only when available 000f68c3 libarchive: Define O_CLOEXEC when missing https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bae0e9c394efd50193f468f5bfd9e66744d8dbc3 commit bae0e9c394efd50193f468f5bfd9e66744d8dbc3 Author: Brad King AuthorDate: Wed Oct 21 14:30:16 2015 -0400 Commit: Brad King CommitDate: Wed Oct 21 14:31:34 2015 -0400 libarchive: Use CommonCrypto on OS X only when available diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor.c b/Utilities/cmlibarchive/libarchive/archive_cryptor.c index 9b01df8..fb7307e 100644 --- a/Utilities/cmlibarchive/libarchive/archive_cryptor.c +++ b/Utilities/cmlibarchive/libarchive/archive_cryptor.c @@ -31,7 +31,7 @@ #include "archive.h" #include "archive_cryptor_private.h" -#ifdef __APPLE__ +#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto static int pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt, @@ -114,7 +114,7 @@ pbkdf2_sha1(const char *pw, size_t pw_len, const uint8_t *salt, #endif -#ifdef __APPLE__ +#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto static int aes_ctr_init(archive_crypto_ctx *ctx, const uint8_t *key, size_t key_len) diff --git a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h index b62ec0c..690dfcc 100644 --- a/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_cryptor_private.h @@ -31,6 +31,13 @@ #define ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED #ifdef __APPLE__ +# include +# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 +# define ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto +# endif +#endif + +#ifdef ARCHIVE_CRYPTOR_USE_Apple_CommonCrypto #include #include #define AES_BLOCK_SIZE 16 diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac.c b/Utilities/cmlibarchive/libarchive/archive_hmac.c index 898853b..36e3e1c 100644 --- a/Utilities/cmlibarchive/libarchive/archive_hmac.c +++ b/Utilities/cmlibarchive/libarchive/archive_hmac.c @@ -31,7 +31,7 @@ #include "archive.h" #include "archive_hmac_private.h" -#ifdef __APPLE__ +#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto static int __hmac_sha1_init(archive_hmac_sha1_ctx *ctx, const uint8_t *key, size_t key_len) diff --git a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h index 6a8bbf2..a9fb8ec 100644 --- a/Utilities/cmlibarchive/libarchive/archive_hmac_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_hmac_private.h @@ -31,6 +31,13 @@ #define ARCHIVE_HMAC_PRIVATE_H_INCLUDED #ifdef __APPLE__ +# include +# if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 +# define ARCHIVE_HMAC_USE_Apple_CommonCrypto +# endif +#endif + +#ifdef ARCHIVE_HMAC_USE_Apple_CommonCrypto #include typedefCCHmacContext archive_hmac_sha1_ctx; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=000f68c3e015fffdab01f3e9768fa4d9f28f4df2 commit 000f68c3e015fffdab01f3e9768fa4d9f28f4df2 Author: Brad King AuthorDate: Wed Oct 21 14:14:54 2015 -0400 Commit: Brad King CommitDate: Wed Oct 21 14:14:54 2015 -0400 libarchive: Define O_CLOEXEC when missing Do this in archive_random.c as we do in several other sources already. diff --git a/Utilities/cmlibarchive/libarchive/archive_random.c b/Utilities/cmlibarchive/libarchive/archive_random.c index 57c49d5..7891077 100644 --- a/Utilities/cmlibarchive/libarchive/archive_random.c +++ b/Utilities/cmlibarchive/libarchive/archive_random.c @@ -62,6 +62,10 @@ static void arc4random_buf(void *, size_t); #include #endif +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif + /* * Random number generator function. * This simply calls arc4random_buf function if the platform provides it. --- Summary of changes: Utilities/cmlibarchive/libarchive/archive_cryptor.c
[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-813-g8ab1833
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 8ab1833c2ad99fa882b7aa85ac87ded78c580576 (commit)
via cee12fd8a8c10258e0dde6cb7c44b64eaf65712c (commit)
from 998a7db7d498dc96407ad960f24d5294859d889b (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=8ab1833c2ad99fa882b7aa85ac87ded78c580576
commit 8ab1833c2ad99fa882b7aa85ac87ded78c580576
Merge: 998a7db cee12fd
Author: Gregor Jasny
AuthorDate: Wed Oct 21 13:31:43 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 13:31:43 2015 -0400
Merge topic 'xcode-optimization-flags' into next
cee12fd8 Xcode: Test that extraction of -O flags preserves others
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cee12fd8a8c10258e0dde6cb7c44b64eaf65712c
commit cee12fd8a8c10258e0dde6cb7c44b64eaf65712c
Author: Gregor Jasny
AuthorDate: Wed Oct 21 19:25:13 2015 +0200
Commit: Gregor Jasny
CommitDate: Wed Oct 21 19:25:13 2015 +0200
Xcode: Test that extraction of -O flags preserves others
diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake
index a8c6816..7901ec0 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(XcodePreserveNonOptimizationFlags)
run_cmake(XcodePreserveObjcFlag)
if (NOT XCODE_VERSION VERSION_LESS 6)
run_cmake(XcodePlatformFrameworks)
diff --git
a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
new file mode 100644
index 000..2f6c03d
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
@@ -0,0 +1,8 @@
+file(STRINGS
${RunCMake_TEST_BINARY_DIR}/XcodePreserveNonOptimizationFlags.xcodeproj/project.pbxproj
actual
+ REGEX "OTHER_CPLUSPLUSFLAGS = [^;]*;")
+foreach(expect "-DA" "-DB +-DC" "-DD")
+ if(NOT "${actual}" MATCHES "${expect}")
+message(SEND_ERROR "The actual project contains the lines:\n ${actual}\n"
+ "which do not match expected regex:\n ${expect}\n")
+ endif()
+endforeach()
diff --git
a/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
new file mode 100644
index 000..16f0381
--- /dev/null
+++ b/Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake
@@ -0,0 +1,12 @@
+set(CMAKE_CONFIGURATION_TYPES "Release" CACHE INTERNAL "Supported
configuration types")
+
+project(XcodePreserveNonOptimizationFlags CXX)
+
+add_library(preserveStart STATIC foo.cpp)
+set_property(TARGET preserveStart PROPERTY COMPILE_OPTIONS -DA -O1)
+
+add_library(preserveBoth STATIC foo.cpp)
+set_property(TARGET preserveBoth PROPERTY COMPILE_OPTIONS -DB -O1 -DC)
+
+add_library(preserveEnd STATIC foo.cpp)
+set_property(TARGET preserveEnd PROPERTY COMPILE_OPTIONS -O1 -DD)
---
Summary of changes:
Tests/RunCMake/XcodeProject/RunCMakeTest.cmake |1 +
.../XcodePreserveNonOptimizationFlags-check.cmake |8
.../XcodeProject/XcodePreserveNonOptimizationFlags.cmake | 12
3 files changed, 21 insertions(+)
create mode 100644
Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake
create mode 100644
Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.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, release, updated. v3.4.0-rc1-26-g498db9b
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, release has been updated via 498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit) from 2ad1fed8ee1ddcee831ffe5b70f2abab52430b70 (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 - --- 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-811-g998a7db
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 998a7db7d498dc96407ad960f24d5294859d889b (commit) via 56cec75058b1980ead58ddda0c371a783547acec (commit) from 0efd8804fb40059974f5aa1d6d2eda81e074ddd1 (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=998a7db7d498dc96407ad960f24d5294859d889b commit 998a7db7d498dc96407ad960f24d5294859d889b Merge: 0efd880 56cec75 Author: Brad King AuthorDate: Wed Oct 21 13:03:03 2015 -0400 Commit: Brad King CommitDate: Wed Oct 21 13:03:03 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.4.0-rc1-340-g56cec75
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 56cec75058b1980ead58ddda0c371a783547acec (commit) via 498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit) from e4b7d5afde91efafb59749a0a513732a089a6f0a (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 - --- 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-798-gd861762
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 d861762709fdf5bd01be4b83e4701194203c646a (commit) via 58c5065bc5bb5d08939669c2abaea4ac8835b75c (commit) via 498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e (commit) from f3ec1567ed0a0980074091afcddf5a6c8a1b015d (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=d861762709fdf5bd01be4b83e4701194203c646a commit d861762709fdf5bd01be4b83e4701194203c646a Merge: f3ec156 58c5065 Author: Brad King AuthorDate: Wed Oct 21 09:28:23 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 09:28:23 2015 -0400 Merge topic 'test-release' into next 58c5065b Merge branch 'release' into test-release 498db9b9 CMake 3.4.0-rc2 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58c5065bc5bb5d08939669c2abaea4ac8835b75c commit 58c5065bc5bb5d08939669c2abaea4ac8835b75c Merge: e4b7d5a 498db9b Author: Brad King AuthorDate: Wed Oct 21 09:27:40 2015 -0400 Commit: Brad King CommitDate: Wed Oct 21 09:27:40 2015 -0400 Merge branch 'release' into test-release https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e commit 498db9b9bcfdf391ff89ffc0b273a65d0bc1bd7e Author: Brad King AuthorDate: Wed Oct 21 09:26:43 2015 -0400 Commit: Brad King CommitDate: Wed Oct 21 09:26:43 2015 -0400 CMake 3.4.0-rc2 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index aaef212..fef0b2e 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 4) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 1) +set(CMake_VERSION_RC 2) --- 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-795-gf3ec156
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 f3ec1567ed0a0980074091afcddf5a6c8a1b015d (commit) via e4b7d5afde91efafb59749a0a513732a089a6f0a (commit) via 2ad1fed8ee1ddcee831ffe5b70f2abab52430b70 (commit) via 779b6ac4f8ba71fe23c1edbcef8678e96e053b6f (commit) from 6a889f151253e98bb7cbe7d500f07c88021a8bce (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=f3ec1567ed0a0980074091afcddf5a6c8a1b015d commit f3ec1567ed0a0980074091afcddf5a6c8a1b015d Merge: 6a889f1 e4b7d5a Author: Brad King AuthorDate: Wed Oct 21 09:25:40 2015 -0400 Commit: Brad King CommitDate: Wed Oct 21 09:25:40 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.4.0-rc1-338-ge4b7d5a
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 e4b7d5afde91efafb59749a0a513732a089a6f0a (commit) via 2ad1fed8ee1ddcee831ffe5b70f2abab52430b70 (commit) via 779b6ac4f8ba71fe23c1edbcef8678e96e053b6f (commit) from 9206120e30d91389470aa0908965103dc301bbae (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 - --- 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, release, updated. v3.4.0-rc1-25-g2ad1fed
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, release has been updated via 2ad1fed8ee1ddcee831ffe5b70f2abab52430b70 (commit) via 779b6ac4f8ba71fe23c1edbcef8678e96e053b6f (commit) via 5a208f834ea6d786611a5dc34dd7ed1d781dd1bc (commit) via d6a03b475e023da9b7532a5b8735caec36b5de86 (commit) from 22bfb39dea2476df8f7aa5ed5c773a7a6720c4bc (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 - --- Summary of changes: Help/command/file.rst |3 +- Source/cmConditionEvaluator.cxx| 40 +--- Source/cmConditionEvaluator.h |9 - Source/cmIfCommand.cxx | 20 +- Source/cmMakefile.cxx |5 ++- Source/cmMakefile.h|2 +- Source/cmWhileCommand.cxx | 15 +++- Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt | 12 ++ Tests/RunCMake/CMP0054/CMP0054-WARN.cmake |2 + .../CMP0054/CMP0054-keywords-WARN-stderr.txt | 13 +++ Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake |2 + 11 files changed, 110 insertions(+), 13 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-310-g196de9d
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 196de9d14d281103e0ee5c36e9dfd39504804aeb (commit) via ed77504d89f99c1a395b5472f51d181ad25b90c0 (commit) from e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 (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=196de9d14d281103e0ee5c36e9dfd39504804aeb commit 196de9d14d281103e0ee5c36e9dfd39504804aeb Merge: e2d4bfe ed77504 Author: Brad King AuthorDate: Wed Oct 21 09:16:51 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 09:16:51 2015 -0400 Merge topic 'deprecate-CMakeForceCompiler' ed77504d CMakeForceCompiler: Deprecate this module and its macros --- Summary of changes: Help/release/dev/deprecate-CMakeForceCompiler.rst |5 + Modules/CMakeForceCompiler.cmake | 18 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 Help/release/dev/deprecate-CMakeForceCompiler.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.4.0-rc1-791-g6a889f1
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 6a889f151253e98bb7cbe7d500f07c88021a8bce (commit) via 9206120e30d91389470aa0908965103dc301bbae (commit) via d31d92bf1d8b13ddff2c85c1fd380519867b788c (commit) via 740f85a204d7a837e3ad408a79992f6a9c0b000c (commit) via 8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (commit) via 196de9d14d281103e0ee5c36e9dfd39504804aeb (commit) via e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 (commit) via f1de724f41a516574f22d2b0e61ebf4b6d65c601 (commit) via 893a7fc2ed71760e1c76c4639985d0e1aec87d04 (commit) from 3df8be1826ac49fb99a495288873bb02f6690e38 (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=6a889f151253e98bb7cbe7d500f07c88021a8bce commit 6a889f151253e98bb7cbe7d500f07c88021a8bce Merge: 3df8be1 9206120 Author: Brad King AuthorDate: Wed Oct 21 09:17:25 2015 -0400 Commit: Brad King CommitDate: Wed Oct 21 09:17:25 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, master, updated. v3.4.0-rc1-335-g9206120
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 9206120e30d91389470aa0908965103dc301bbae (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) via 215cd21a0238ba00aec7c81014fe83e3d47187a6 (commit) via 1df8bd3ab0f6621b90a8801c1d10cfc94c74ff96 (commit) via 83703bda7d1017e1f75ec1b92d672d5ef17194d5 (commit) from d31d92bf1d8b13ddff2c85c1fd380519867b788c (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=9206120e30d91389470aa0908965103dc301bbae commit 9206120e30d91389470aa0908965103dc301bbae Merge: d31d92b c099e00 Author: Brad King AuthorDate: Wed Oct 21 09:17:01 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 09:17:01 2015 -0400 Merge topic 'use-generator-target' 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. 215cd21a cmGeneratorTarget: Provide direct access to the backtrace. 1df8bd3a cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget. 83703bda cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget. --- Summary of changes: Source/cmCommonTargetGenerator.cxx |5 +- Source/cmComputeLinkDepends.cxx|4 +- Source/cmComputeLinkInformation.cxx| 22 ++-- Source/cmComputeTargetDepends.cxx |8 +- Source/cmExportBuildFileGenerator.cxx |6 +- Source/cmExportFileGenerator.cxx | 12 +-- Source/cmExportInstallFileGenerator.cxx|4 +- Source/cmExtraSublimeTextGenerator.cxx |2 +- Source/cmGeneratorExpressionNode.cxx |2 +- Source/cmGeneratorTarget.cxx | 136 +--- Source/cmGeneratorTarget.h | 26 + Source/cmGhsMultiTargetGenerator.cxx |2 +- Source/cmGlobalGenerator.cxx |6 +- Source/cmGlobalGenerator.h |2 +- Source/cmGlobalXCodeGenerator.cxx |2 +- Source/cmLinkItem.h| 24 + Source/cmLocalGenerator.cxx| 12 +-- Source/cmLocalVisualStudio6Generator.cxx |2 +- Source/cmLocalVisualStudio7Generator.cxx |2 +- Source/cmMakefileExecutableTargetGenerator.cxx |4 +- Source/cmOSXBundleGenerator.cxx|2 +- Source/cmOrderDirectories.cxx |4 +- Source/cmPolicies.h| 17 +++ Source/cmTarget.cxx| 68 Source/cmTarget.h | 33 -- Source/cmVisualStudio10TargetGenerator.cxx |3 +- 26 files changed, 221 insertions(+), 189 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-323-gd31d92b
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 d31d92bf1d8b13ddff2c85c1fd380519867b788c (commit) via c0969b10330a205a693bdf658185740eea51736e (commit) via 6a1e73281f216d2644dc3527be01c3d38b9e1263 (commit) via 00f50b006cc9afd014374fabc10bdef1330075a2 (commit) via 3df749af55c04d5b7bb0ee848c6df112178327bc (commit) via 3029c27e46a193c6319a3c909f938e6614c2b14f (commit) from 740f85a204d7a837e3ad408a79992f6a9c0b000c (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=d31d92bf1d8b13ddff2c85c1fd380519867b788c commit d31d92bf1d8b13ddff2c85c1fd380519867b788c Merge: 740f85a c0969b1 Author: Brad King AuthorDate: Wed Oct 21 09:16:58 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 09:16:58 2015 -0400 Merge topic 'inline-cmMakeDepend-content' c0969b10 cmMakeDepend: Inline into inheriting class. 6a1e7328 cmMakeDepend: Inline into only user. 00f50b00 cmMakeDepend: Inline into header. 3df749af Remove vestigial declarations. 3029c27e cmMakeDepend: Use public cmMakefile API. --- Summary of changes: Source/CMakeLists.txt |2 - Source/cmLocalUnixMakefileGenerator3.h |1 - Source/cmMakeDepend.cxx | 361 --- Source/cmMakeDepend.h | 150 Source/cmMakefile.h |4 - Source/cmMakefileTargetGenerator.h |1 - Source/cmOutputRequiredFilesCommand.cxx | 598 +-- Source/cmOutputRequiredFilesCommand.h |3 +- bootstrap |1 - 9 files changed, 496 insertions(+), 625 deletions(-) delete mode 100644 Source/cmMakeDepend.cxx delete mode 100644 Source/cmMakeDepend.h 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-306-gf1de724
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 f1de724f41a516574f22d2b0e61ebf4b6d65c601 (commit) via 5a208f834ea6d786611a5dc34dd7ed1d781dd1bc (commit) from 893a7fc2ed71760e1c76c4639985d0e1aec87d04 (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=f1de724f41a516574f22d2b0e61ebf4b6d65c601 commit f1de724f41a516574f22d2b0e61ebf4b6d65c601 Merge: 893a7fc 5a208f8 Author: Brad King AuthorDate: Wed Oct 21 09:16:47 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 09:16:47 2015 -0400 Merge topic 'doc-file-GLOB-no-order' 5a208f83 Help: Document that file(GLOB*) order is undefined --- Summary of changes: Help/command/file.rst |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, master, updated. v3.4.0-rc1-312-g8bcf2c8
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 8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (commit) via 123de1914c7e7d53d1e295c73994b2780041b8fc (commit) from 196de9d14d281103e0ee5c36e9dfd39504804aeb (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=8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e commit 8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e Merge: 196de9d 123de19 Author: Brad King AuthorDate: Wed Oct 21 09:16:53 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 09:16:53 2015 -0400 Merge topic 'ninja-refactor-deptype-selection' 123de191 Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains --- 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, master, updated. v3.4.0-rc1-317-g740f85a
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 740f85a204d7a837e3ad408a79992f6a9c0b000c (commit)
via a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8 (commit)
via 04b6bb167636ccf2fe565239a44249366ee1e452 (commit)
via 400e3d19fcebf7d6e9551d585d60754bd937c28c (commit)
via 726e461b3885aca4144ec79d08bf62c7ebade96d (commit)
from 8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (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=740f85a204d7a837e3ad408a79992f6a9c0b000c
commit 740f85a204d7a837e3ad408a79992f6a9c0b000c
Merge: 8bcf2c8 a4bbdc5
Author: Brad King
AuthorDate: Wed Oct 21 09:16:56 2015 -0400
Commit: CMake Topic Stage
CommitDate: Wed Oct 21 09:16:56 2015 -0400
Merge topic 'cmLocalGenerator-generator-target-storage'
a4bbdc5e 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.
---
Summary of changes:
Source/cmExtraEclipseCDT4Generator.cxx |4 --
Source/cmGlobalGenerator.cxx |5 +-
Source/cmGlobalUnixMakefileGenerator3.cxx | 12 -
Source/cmGlobalVisualStudio8Generator.cxx |1 +
Source/cmGlobalVisualStudioGenerator.cxx |1 +
Source/cmGlobalXCodeGenerator.cxx |2 +
Source/cmLocalGenerator.cxx|8 +---
Source/cmLocalGenerator.h |4 --
Source/cmLocalGhsMultiGenerator.cxx|3 +-
Source/cmLocalNinjaGenerator.cxx |3 +-
Source/cmLocalUnixMakefileGenerator3.cxx |8 +---
Source/cmQtAutoGeneratorInitializer.cxx|1 +
.../VisibilityPreset/CMP0063-WARN-exe-stderr.txt | 15 ++
...P0063-WARN-yes.cmake => CMP0063-WARN-exe.cmake} |5 +-
.../VisibilityPreset/CMP0063-WARN-obj-stderr.txt | 15 ++
...P0063-WARN-yes.cmake => CMP0063-WARN-obj.cmake} |5 +-
.../VisibilityPreset/CMP0063-WARN-sta-stderr.txt | 15 ++
...P0063-WARN-yes.cmake => CMP0063-WARN-sta.cmake} |5 +-
.../VisibilityPreset/CMP0063-WARN-yes-stderr.txt | 50
Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake |4 +-
20 files changed, 70 insertions(+), 96 deletions(-)
create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe-stderr.txt
copy Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake =>
CMP0063-WARN-exe.cmake} (68%)
create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj-stderr.txt
copy Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake =>
CMP0063-WARN-obj.cmake} (67%)
create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta-stderr.txt
rename Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake =>
CMP0063-WARN-sta.cmake} (67%)
delete mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes-stderr.txt
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-308-ge2d4bfe
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 e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 (commit) via d6a03b475e023da9b7532a5b8735caec36b5de86 (commit) from f1de724f41a516574f22d2b0e61ebf4b6d65c601 (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=e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 commit e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 Merge: f1de724 d6a03b4 Author: Brad King AuthorDate: Wed Oct 21 09:16:49 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 09:16:49 2015 -0400 Merge topic 'fix-CMP0054-elseif-warning' d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802) --- Summary of changes: Source/cmConditionEvaluator.cxx| 40 +--- Source/cmConditionEvaluator.h |9 - Source/cmIfCommand.cxx | 20 +- Source/cmMakefile.cxx |5 ++- Source/cmMakefile.h|2 +- Source/cmWhileCommand.cxx | 15 +++- Tests/RunCMake/CMP0054/CMP0054-WARN-stderr.txt | 12 ++ Tests/RunCMake/CMP0054/CMP0054-WARN.cmake |2 + .../CMP0054/CMP0054-keywords-WARN-stderr.txt | 13 +++ Tests/RunCMake/CMP0054/CMP0054-keywords-WARN.cmake |2 + 10 files changed, 108 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-782-g3df8be1
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 3df8be1826ac49fb99a495288873bb02f6690e38 (commit) via 5a208f834ea6d786611a5dc34dd7ed1d781dd1bc (commit) from 2fc8bee548c8d15d34ae9357523e0d5423026c03 (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=3df8be1826ac49fb99a495288873bb02f6690e38 commit 3df8be1826ac49fb99a495288873bb02f6690e38 Merge: 2fc8bee 5a208f8 Author: Brad King AuthorDate: Wed Oct 21 08:53:23 2015 -0400 Commit: CMake Topic Stage CommitDate: Wed Oct 21 08:53:23 2015 -0400 Merge topic 'doc-file-GLOB-no-order' into next 5a208f83 Help: Document that file(GLOB*) order is undefined https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a208f834ea6d786611a5dc34dd7ed1d781dd1bc commit 5a208f834ea6d786611a5dc34dd7ed1d781dd1bc Author: Ruslan Baratov AuthorDate: Wed Oct 21 02:53:37 2015 +0600 Commit: Brad King CommitDate: Wed Oct 21 08:51:54 2015 -0400 Help: Document that file(GLOB*) order is undefined Since this command use 'readdir' under the hood the order of list is undefined: * http://stackoverflow.com/questions/8977441/does-readdir-guarantee-an-order diff --git a/Help/command/file.rst b/Help/command/file.rst index bbddd40..96ac6c7 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -103,7 +103,8 @@ Generate a list of files that match the and store it into the . Globbing expressions are similar to regular expressions, but much simpler. If ``RELATIVE`` flag is specified, the results will be returned as relative paths to the given -path. +path. No specific order of results is defined. If order is important then +sort the list explicitly (e.g. using the :command:`list(SORT)` command). By default ``GLOB`` lists directories - directories are omited in result if ``LIST_DIRECTORIES`` is set to false. --- Summary of changes: Help/command/file.rst |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
