[Cmake-commits] CMake branch, next, updated. v2.8.8-2821-g2aa7697
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 2aa76977fc9dcc36cc4c2073a020f5ed4e77994a (commit) via 707afd1ed0d5d21760e33c5345b86be22d3d6ef5 (commit) from a02619930e10121c29189d6c20da1a7b1d7f9efd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2aa76977fc9dcc36cc4c2073a020f5ed4e77994a commit 2aa76977fc9dcc36cc4c2073a020f5ed4e77994a Merge: a026199 707afd1 Author: Brad King brad.k...@kitware.com AuthorDate: Mon May 7 08:52:55 2012 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon May 7 08:52:55 2012 -0400 Merge topic 'doc-html-index' into next 707afd1 Documentation: Improve HTML section index format http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=707afd1ed0d5d21760e33c5345b86be22d3d6ef5 commit 707afd1ed0d5d21760e33c5345b86be22d3d6ef5 Author: Brad King brad.k...@kitware.com AuthorDate: Mon May 7 08:50:08 2012 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon May 7 08:51:57 2012 -0400 Documentation: Improve HTML section index format Add a newline after section index list items. This makes the generated HTML source more readable. diff --git a/Source/cmDocumentationFormatterHTML.cxx b/Source/cmDocumentationFormatterHTML.cxx index ed28b45..cd0077e 100644 --- a/Source/cmDocumentationFormatterHTML.cxx +++ b/Source/cmDocumentationFormatterHTML.cxx @@ -145,7 +145,7 @@ void cmDocumentationFormatterHTML cmDocumentationPrintHTMLId(os, op-Name.c_str()); os \bcode; this-PrintHTMLEscapes(os, op-Name.c_str()); -os /code/b/a/li; +os /code/b/a/li\n; } } os /ul\n ; --- Summary of changes: Source/cmDocumentationFormatterHTML.cxx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.8-2823-g73eca95
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 73eca95efb59146c7b1dee52768356be5c8b5e58 (commit)
via 1b418f1fbfdeea561cc175929ac677d93e523e41 (commit)
from 2aa76977fc9dcc36cc4c2073a020f5ed4e77994a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73eca95efb59146c7b1dee52768356be5c8b5e58
commit 73eca95efb59146c7b1dee52768356be5c8b5e58
Merge: 2aa7697 1b418f1
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Mon May 7 15:32:52 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 7 15:32:52 2012 -0400
Merge topic 'mumps_coverage' into next
1b418f1 Change GT.M Coverage Parser global
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b418f1fbfdeea561cc175929ac677d93e523e41
commit 1b418f1fbfdeea561cc175929ac677d93e523e41
Author: Joseph Snyder joe.sny...@kitware.com
AuthorDate: Mon May 7 14:12:51 2012 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Mon May 7 15:29:52 2012 -0400
Change GT.M Coverage Parser global
The coverage global should be in the local namespace. This means the global
will be ^ZZCOVERAGE instead of ^COVERAGE. Change the parser to look for
^ZZCOVERAGE
instead of the old ^COVERAGE
diff --git a/Source/CTest/cmParseGTMCoverage.cxx
b/Source/CTest/cmParseGTMCoverage.cxx
index f850c3c..e1f02d6 100644
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/Source/CTest/cmParseGTMCoverage.cxx
@@ -61,7 +61,7 @@ bool cmParseGTMCoverage::ReadMCovFile(const char* file)
while( cmSystemTools::GetLineFromStream(in, line))
{
// only look at lines that have coverage data
-if(line.find(^COVERAGE) == line.npos)
+if(line.find(^ZZCOVERAGE) == line.npos)
{
continue;
}
---
Summary of changes:
Source/CTest/cmParseGTMCoverage.cxx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.8-2825-g5c1d77f
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 5c1d77fe70bc96a89e2afe5ddb40234aac092d5f (commit) via c5a67a7fec2dde8caba8044de3699331a89db020 (commit) from 73eca95efb59146c7b1dee52768356be5c8b5e58 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c1d77fe70bc96a89e2afe5ddb40234aac092d5f commit 5c1d77fe70bc96a89e2afe5ddb40234aac092d5f Merge: 73eca95 c5a67a7 Author: Brad King brad.k...@kitware.com AuthorDate: Mon May 7 15:34:00 2012 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon May 7 15:34:00 2012 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.8-2829-ge871e04
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 e871e04ec8619348e83ba1d88b34797b75f924e5 (commit)
via 470f39cf4ea3da35716e6f4ea5bbdc17b5b0e814 (commit)
from 08c18b79621aae38ab8df68b1bf6573b128d6cc2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e871e04ec8619348e83ba1d88b34797b75f924e5
commit e871e04ec8619348e83ba1d88b34797b75f924e5
Merge: 08c18b7 470f39c
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon May 7 15:51:53 2012 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon May 7 15:51:53 2012 -0400
Merge topic 'vs-osx-framework-headers' into next
470f39c VS: Restore header files marked as OS X Framework content (#13196)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=470f39cf4ea3da35716e6f4ea5bbdc17b5b0e814
commit 470f39cf4ea3da35716e6f4ea5bbdc17b5b0e814
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon May 7 15:24:16 2012 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon May 7 15:28:19 2012 -0400
VS: Restore header files marked as OS X Framework content (#13196)
Header files listed in a target's PUBLIC_HEADER or similar properties
are marked as OS X Framework content. Refactoring performed by
commit 11d9b211 (Add cmGeneratorTarget to represent a target during
generation, 2012-03-07)
commit 45c2f932 (Simplify cmMakefileTargetGenerator using
cmGeneratorTarget, 2012-03-07)
commit 328c0f65 (Simplify cmVisualStudio10TargetGenerator source
classification, 2012-03-19)
and related commits accidentally removed such files from treatment as
normal header files by the VS generator (generators other than Makefiles
and Xcode). Move handling of such files out of cmGeneratorTarget and
back to cmMakefileTargetGenerator. The central cmGeneratorTarget
classification will always treat them as header or extra sources.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 42dd428..6e2e23d 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -39,17 +39,10 @@ void cmGeneratorTarget::ClassifySources()
{
cmSourceFile* sf = *si;
std::string ext = cmSystemTools::LowerCase(sf-GetExtension());
-cmTarget::SourceFileFlags tsFlags =
- this-Target-GetTargetSourceFileFlags(sf);
if(sf-GetCustomCommand())
{
this-CustomCommands.push_back(sf);
}
-else if(tsFlags.Type != cmTarget::SourceFileTypeNormal)
- {
- this-OSXContent.push_back(sf);
- if(isObjLib) { badObjLib.push_back(sf); }
- }
else if(sf-GetPropertyAsBool(HEADER_FILE_ONLY))
{
this-HeaderSources.push_back(sf);
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 3e50656..5c7578d 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -37,7 +37,6 @@ public:
std::vectorcmSourceFile* HeaderSources;
std::vectorcmSourceFile* ObjectSources;
std::vectorcmSourceFile* ExternalObjects;
- std::vectorcmSourceFile* OSXContent;
std::vectorcmSourceFile* IDLSources;
std::string ModuleDefinitionFile;
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index a0e0481..408f287 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -153,14 +153,8 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
}
}
}
- for(std::vectorcmSourceFile*::const_iterator
-si = this-GeneratorTarget-OSXContent.begin();
- si != this-GeneratorTarget-OSXContent.end(); ++si)
-{
-cmTarget::SourceFileFlags tsFlags =
- this-Target-GetTargetSourceFileFlags(*si);
-this-WriteMacOSXContentRules(**si, tsFlags.MacFolder);
-}
+ this-WriteMacOSXContentRules(this-GeneratorTarget-HeaderSources);
+ this-WriteMacOSXContentRules(this-GeneratorTarget-ExtraSources);
for(std::vectorcmSourceFile*::const_iterator
si = this-GeneratorTarget-ExternalObjects.begin();
si != this-GeneratorTarget-ExternalObjects.end(); ++si)
@@ -354,6 +348,22 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
}
//
+void cmMakefileTargetGenerator::WriteMacOSXContentRules(
+ std::vectorcmSourceFile* const sources)
+{
+ for(std::vectorcmSourceFile*::const_iterator
+si = sources.begin(); si != sources.end(); ++si)
+{
+cmTarget::SourceFileFlags tsFlags =
+ this-Target-GetTargetSourceFileFlags(*si);
+if(tsFlags.Type != cmTarget::SourceFileTypeNormal)
+
[Cmake-commits] CMake branch, master, updated. v2.8.8-131-g21aea01
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 21aea010c4edf35c34e0f7a8e43d2aeeaec88be0 (commit) from c5a67a7fec2dde8caba8044de3699331a89db020 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21aea010c4edf35c34e0f7a8e43d2aeeaec88be0 commit 21aea010c4edf35c34e0f7a8e43d2aeeaec88be0 Author: Kitware Robot kwro...@kitware.com AuthorDate: Tue May 8 00:01:05 2012 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Tue May 8 00:01:05 2012 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8f614c5..9a31b07 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 8) SET(CMake_VERSION_PATCH 8) -SET(CMake_VERSION_TWEAK 20120507) +SET(CMake_VERSION_TWEAK 20120508) #SET(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
