[Cmake-commits] CMake branch, master, updated. v2.8.6-279-g89f6fba
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 89f6fbaae355c4b84a39640752c98a2c6d1b34e6 (commit) from 912c02c68222f86a3a10f3ab9a63f9566e131dac (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=89f6fbaae355c4b84a39640752c98a2c6d1b34e6 commit 89f6fbaae355c4b84a39640752c98a2c6d1b34e6 Author: KWSys Robot AuthorDate: Tue Nov 29 00:05:04 2011 -0500 Commit: KWSys Robot CommitDate: Tue Nov 29 00:05:04 2011 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 2c9a603..082aaba 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2011) SET(KWSYS_DATE_STAMP_MONTH 11) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 28) +SET(KWSYS_DATE_STAMP_DAY 29) --- Summary of changes: Source/kwsys/kwsysDateStamp.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.6-2056-gca7beec
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 ca7beecb9ee918fb09d0bfe4c8c4918dc6f40755 (commit)
via a087490697c416d429d30fdf389cca2f13d9d14e (commit)
from 1c083ab76182721c80bf210d00768290e6af4ce1 (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=ca7beecb9ee918fb09d0bfe4c8c4918dc6f40755
commit ca7beecb9ee918fb09d0bfe4c8c4918dc6f40755
Merge: 1c083ab a087490
Author: Brad King
AuthorDate: Mon Nov 28 13:49:35 2011 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 28 13:49:35 2011 -0500
Merge topic 'newline-style' into next
a087490 Add NEWLINE_STYLE option to configure_file (#3957)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a087490697c416d429d30fdf389cca2f13d9d14e
commit a087490697c416d429d30fdf389cca2f13d9d14e
Author: Peter Kuemmel
AuthorDate: Sun Nov 20 14:04:11 2011 +0100
Commit: Brad King
CommitDate: Mon Nov 28 13:48:59 2011 -0500
Add NEWLINE_STYLE option to configure_file (#3957)
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ba41d98..7dcb6c3 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -214,6 +214,8 @@ SET(SRCS
cmMakefileExecutableTargetGenerator.cxx
cmMakefileLibraryTargetGenerator.cxx
cmMakefileUtilityTargetGenerator.cxx
+ cmNewLineStyle.h
+ cmNewLineStyle.cxx
cmOrderDirectories.cxx
cmOrderDirectories.h
cmPolicies.h
diff --git a/Source/cmConfigureFileCommand.cxx
b/Source/cmConfigureFileCommand.cxx
index c1327fb..ea98326 100644
--- a/Source/cmConfigureFileCommand.cxx
+++ b/Source/cmConfigureFileCommand.cxx
@@ -65,6 +65,12 @@ bool cmConfigureFileCommand
cmSystemTools::SetFatalErrorOccured();
return false;
}
+ std::string errorMessage;
+ if (!this->NewLineStyle.ReadFromArguments(args, errorMessage))
+{
+this->SetError(errorMessage.c_str());
+return false;
+}
this->CopyOnly = false;
this->EscapeQuotes = false;
@@ -78,6 +84,12 @@ bool cmConfigureFileCommand
if(args[i] == "COPYONLY")
{
this->CopyOnly = true;
+ if (this->NewLineStyle.IsValid())
+{
+this->SetError("COPYONLY could not be used in combination "
+ "with NEWLINE_STYLE");
+return false;
+}
}
else if(args[i] == "ESCAPE_QUOTES")
{
@@ -122,7 +134,8 @@ int cmConfigureFileCommand::ConfigureFile()
this->OutputFile.c_str(),
this->CopyOnly,
this->AtOnly,
-this->EscapeQuotes);
+this->EscapeQuotes,
+this->NewLineStyle);
}
diff --git a/Source/cmConfigureFileCommand.h b/Source/cmConfigureFileCommand.h
index 844a23c..be33569 100644
--- a/Source/cmConfigureFileCommand.h
+++ b/Source/cmConfigureFileCommand.h
@@ -56,7 +56,8 @@ public:
{
return
" configure_file( \n"
-" [COPYONLY] [ESCAPE_QUOTES] [@ONLY])\n"
+" [COPYONLY] [ESCAPE_QUOTES] [@ONLY] \n"
+" [NEWLINE_STYLE [UNIX|DOS|WIN32|LF|CRLF] ])\n"
"Copies a file to file and substitutes variable "
"values referenced in the file content. "
"If is a relative path it is evaluated with respect to "
@@ -81,14 +82,20 @@ public:
"either #define VAR or /* #undef VAR */ depending on "
"the setting of VAR in CMake. Any occurrences of #cmakedefine01 VAR "
"will be replaced with either #define VAR 1 or #define VAR 0 "
-"depending on whether VAR evaluates to TRUE or FALSE in CMake";
+"depending on whether VAR evaluates to TRUE or FALSE in CMake.\n"
+"With NEWLINE_STYLE the line ending could be adjusted: \n"
+"'UNIX' or 'LF' for \\n, 'DOS', 'WIN32' or 'CRLF' for \\r\\n.\n"
+"COPYONLY must not be used with NEWLINE_STYLE.\n";
}
virtual void FinalPass();
virtual bool HasFinalPass() const { return !this->Immediate; }
+
private:
int ConfigureFile();
+ cmNewLineStyle NewLineStyle;
+
std::string InputFile;
std::string OutputFile;
bool CopyOnly;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 573c430..7939d73 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3213,7 +3213,8 @@ void cmMakefile::ConfigureString(const std::string& input,
}
int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
- bool copyonly, bool atOnly, bool escapeQuotes)
+ bool copyonly, bool atOnly, bool escapeQuotes,
+ const cmNewLineStyle& newLine)
{
int res = 1;
if ( !this->CanIWriteThisFile(outfile) )
@@ -3250,9
[Cmake-commits] CMake branch, next, updated. v2.8.6-2054-g1c083ab
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 1c083ab76182721c80bf210d00768290e6af4ce1 (commit)
via a1f976ce0e62baf513c8726c59aba5f75a0335c6 (commit)
from c68b52707b3cab82686b24a44db8749a059de309 (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=1c083ab76182721c80bf210d00768290e6af4ce1
commit 1c083ab76182721c80bf210d00768290e6af4ce1
Merge: c68b527 a1f976c
Author: Brad King
AuthorDate: Mon Nov 28 11:55:42 2011 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 28 11:55:42 2011 -0500
Merge topic 'vs-managed-projects' into next
a1f976c VS: Add support for three new project properties (#12586)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1f976ce0e62baf513c8726c59aba5f75a0335c6
commit a1f976ce0e62baf513c8726c59aba5f75a0335c6
Author: Aaron Ten Clay
AuthorDate: Wed Nov 23 14:11:00 2011 -0500
Commit: Brad King
CommitDate: Mon Nov 28 11:44:04 2011 -0500
VS: Add support for three new project properties (#12586)
VS_GLOBAL_PROJECT_TYPES: A string containing UUIDs to embed in the
Visual Studio project file under .
VS_GLOBAL_KEYWORD: Allows specification of a keyword like "ManagedCProj"
instead of the default "Win32Proj", under
VS_DOTNET_REFERENCES: Semicolon-delimited list of .NET references to add
to the project, which creates a new .
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index dad0353..d021990 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1038,6 +1038,29 @@ void cmTarget::DefineProperties(cmake *cm)
"Can be set to change the visual studio source code control "
"auxpath property.");
cm->DefineProperty
+("VS_GLOBAL_PROJECT_TYPES", cmProperty::TARGET,
+ "Visual Studio project type(s).",
+ "Can be set to one or more UUIDs recognized by Visual Studio "
+ "to indicate the type of project. This value is copied "
+ "verbatim into the generated project file. Example for a "
+ "managed C++ unit testing project: \""
+ "{3AC096D0-A1C2-E12C-1390-A8335801FDAB};"
+ "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\". UUIDs are "
+ "semicolon-delimited.");
+ cm->DefineProperty
+("VS_GLOBAL_KEYWORD", cmProperty::TARGET,
+ "Visual Studio project keyword.",
+ "Sets the \"keyword\" attribute for a generated Visual Studio "
+ "project. Defaults to \"Win32Proj\". You may wish to override "
+ "this value with \"ManagedCProj\", for example, in a Visual "
+ "Studio managed C++ unit test project.");
+ cm->DefineProperty
+("VS_DOTNET_REFERENCES", cmProperty::TARGET,
+ "Visual Studio managed project .NET references",
+ "Adds one or more semicolon-delimited .NET references to a "
+ "generated Visual Studio project. For example, \"System;"
+ "System.Windows.Forms\".");
+ cm->DefineProperty
("VS_GLOBAL_", cmProperty::TARGET,
"Visual Studio project-specific global variable.",
"Tell the Visual Studio generator to set the global variable "
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index fcb668a..a219ae9 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -178,6 +178,15 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteString("", 2);
(*this->BuildFileStream) << "{" << this->GUID << "}\n";
+ const char* vsProjectTypes =
+this->Target->GetProperty("VS_GLOBAL_PROJECT_TYPES");
+ if(vsProjectTypes)
+{
+this->WriteString("", 2);
+(*this->BuildFileStream) << cmVS10EscapeXML(vsProjectTypes) <<
+ "\n";
+}
+
const char* vsProjectName = this->Target->GetProperty("VS_SCC_PROJECTNAME");
const char* vsLocalPath = this->Target->GetProperty("VS_SCC_LOCALPATH");
const char* vsProvider = this->Target->GetProperty("VS_SCC_PROVIDER");
@@ -203,7 +212,19 @@ void cmVisualStudio10TargetGenerator::Generate()
}
}
- this->WriteString("Win32Proj\n", 2);
+ const char* vsGlobalKeyword =
+this->Target->GetProperty("VS_GLOBAL_KEYWORD");
+ if(!vsGlobalKeyword)
+{
+this->WriteString("Win32Proj\n", 2);
+}
+ else
+{
+this->WriteString("", 2);
+(*this->BuildFileStream) << cmVS10EscapeXML(vsGlobalKeyword) <<
+ "\n";
+}
+
this->WriteString("", 2);
(*this->BuildFileStream) << this->Platform << "\n";
const char* projLabel = this->Target->GetProperty("PROJECT_LABEL");
@@ -233,6 +254,7 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteCustomCommands();
this->WriteObjSources();
this->WriteCLSources();
[Cmake-commits] CMake branch, next, updated. v2.8.6-2052-gc68b527
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 c68b52707b3cab82686b24a44db8749a059de309 (commit)
via 9318de99b623702ba914601547a6fbce91affa43 (commit)
from 3bb3ae85f5a565827916aea82b8b0a04a7351e6a (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=c68b52707b3cab82686b24a44db8749a059de309
commit c68b52707b3cab82686b24a44db8749a059de309
Merge: 3bb3ae8 9318de9
Author: Stephen Kelly
AuthorDate: Mon Nov 28 10:56:59 2011 -0500
Commit: CMake Topic Stage
CommitDate: Mon Nov 28 10:56:59 2011 -0500
Merge topic 'revert-target-include-directories' into next
9318de9 Revert merge of this feature into next.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9318de99b623702ba914601547a6fbce91affa43
commit 9318de99b623702ba914601547a6fbce91affa43
Author: Stephen Kelly
AuthorDate: Mon Nov 28 16:54:03 2011 +0100
Commit: Stephen Kelly
CommitDate: Mon Nov 28 16:55:41 2011 +0100
Revert merge of this feature into next.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 5f7f948..ffbeb48 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -574,11 +574,7 @@ void
cmLocalGenerator::AddCustomCommandToCreateObject(const char* ofname,
std::string flags;
flags += this->Makefile->GetSafeDefinition(varString.c_str());
flags += " ";
-{
-std::vector includes;
-this->GetIncludeDirectories(includes, lang);
-flags += this->GetIncludeFlags(includes, lang);
-}
+ flags += this->GetIncludeFlags(lang);
flags += this->Makefile->GetDefineFlags();
// Construct the command lines.
@@ -1196,8 +1192,8 @@ cmLocalGenerator::ConvertToIncludeReference(std::string
const& path)
}
//
-const char* cmLocalGenerator::GetIncludeFlags(const std::vector
&includes,
- const char* lang, bool
forResponseFile)
+const char* cmLocalGenerator::GetIncludeFlags(const char* lang,
+ bool forResponseFile)
{
if(!lang)
{
@@ -1207,12 +1203,13 @@ const char* cmLocalGenerator::GetIncludeFlags(const
std::vector &in
key += forResponseFile? "@" : "";
if(this->LanguageToIncludeFlags.count(key))
{
- // Introduced to cmLocalUnixMakefileGenerator in
692ba48c4e5762b370f2999e902b8bd677c77161
- // It seems to just be memoization. Can it be removed?
-// return this->LanguageToIncludeFlags[key].c_str();
+return this->LanguageToIncludeFlags[key].c_str();
}
cmOStringStream includeFlags;
+ std::vector includes;
+ this->GetIncludeDirectories(includes, lang);
+ std::vector::iterator i;
std::string flagVar = "CMAKE_INCLUDE_FLAG_";
flagVar += lang;
@@ -1254,7 +1251,6 @@ const char* cmLocalGenerator::GetIncludeFlags(const
std::vector &in
#ifdef __APPLE__
emitted.insert("/System/Library/Frameworks");
#endif
- std::vector::const_iterator i;
for(i = includes.begin(); i != includes.end(); ++i)
{
if(this->Makefile->IsOn("APPLE")
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 7e737ef..0c5b9d0 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -146,8 +146,8 @@ public:
///! Append flags to a string.
virtual void AppendFlags(std::string& flags, const char* newFlags);
///! Get the include flags for the current makefile and language
- const char* GetIncludeFlags(const std::vector &includes,
- const char* lang, bool forResponseFile = false);
+ const char* GetIncludeFlags(const char* lang,
+ bool forResponseFile = false);
/**
* Encode a list of preprocessor definitions for the compiler
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index 36465b5..8b91194 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -275,7 +275,7 @@ std::string cmMakefileTargetGenerator::GetFlags(const
std::string &l)
// Add shared-library flags if needed.
this->LocalGenerator->AddSharedFlags(flags, lang, shared);
-// Add include directory and target include flags.
+// Add include directory flags.
this->AddIncludeFlags(flags, lang);
// Append old-style preprocessor definition flags.
@@ -1812,13 +1812,8 @@ void
cmMakefileTargetGenerator::AddIncludeFlags(std::string& flags,
responseVar += "_USE_RESPONSE_FILE_FOR_INCLUDES";
bool useResponseFile = this->Makefile->IsOn(responseVar.c_str());
-
- std::vector in
[Cmake-commits] CMake branch, master, updated. v2.8.6-278-g912c02c
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 912c02c68222f86a3a10f3ab9a63f9566e131dac (commit) from 10c3113464eb66739550f18dd06f8b2f75affe99 (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=912c02c68222f86a3a10f3ab9a63f9566e131dac commit 912c02c68222f86a3a10f3ab9a63f9566e131dac Author: KWSys Robot AuthorDate: Mon Nov 28 00:05:05 2011 -0500 Commit: KWSys Robot CommitDate: Mon Nov 28 00:05:05 2011 -0500 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 58aca97..2c9a603 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2011) SET(KWSYS_DATE_STAMP_MONTH 11) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 27) +SET(KWSYS_DATE_STAMP_DAY 28) --- Summary of changes: Source/kwsys/kwsysDateStamp.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
