[Cmake-commits] CMake branch, next, updated. v3.2.1-1807-g823bac3
Brad King
brad.king at kitware.com
Mon Apr 13 09:55:23 EDT 2015
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 823bac306c688aa043e7d9c4ef8ecceb74e8c322 (commit)
via a0477826da917e86fdb47b0fea68f742b6dacaf3 (commit)
via 44000501b2e9662496362a8ff27e3aed6f0e8232 (commit)
via c2e650bf93d6735ea4997afffffd509f2b06d80b (commit)
from 14425486989dc3a724c3ff126725e10de7479751 (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=823bac306c688aa043e7d9c4ef8ecceb74e8c322
commit 823bac306c688aa043e7d9c4ef8ecceb74e8c322
Merge: 1442548 a047782
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 09:55:22 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 13 09:55:22 2015 -0400
Merge topic 'add-GreenHills-MULTI-generator' into next
a0477826 Help: Add notes for topic 'add-GreenHills-MULTI-generator'
44000501 GHS: Note that generator is experimental
c2e650bf GHS: removed hard coded flag and cleaned cmds
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0477826da917e86fdb47b0fea68f742b6dacaf3
commit a0477826da917e86fdb47b0fea68f742b6dacaf3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 09:51:46 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 13 09:54:52 2015 -0400
Help: Add notes for topic 'add-GreenHills-MULTI-generator'
diff --git a/Help/release/dev/add-GreenHills-MULTI-generator.rst b/Help/release/dev/add-GreenHills-MULTI-generator.rst
new file mode 100644
index 0000000..b4c5c5a
--- /dev/null
+++ b/Help/release/dev/add-GreenHills-MULTI-generator.rst
@@ -0,0 +1,8 @@
+add-GreenHills-MULTI-generator
+------------------------------
+
+* A new experimental :generator:`Green Hills MULTI` generator was
+ added on Windows. `Green Hills MULTI`_ is an IDE for embedded
+ real-time systems.
+
+.. _`Green Hills MULTI`: http://www.ghs.com/products/MULTI_IDE.html
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=44000501b2e9662496362a8ff27e3aed6f0e8232
commit 44000501b2e9662496362a8ff27e3aed6f0e8232
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 09:51:38 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 13 09:54:51 2015 -0400
GHS: Note that generator is experimental
diff --git a/Help/generator/Green Hills MULTI.rst b/Help/generator/Green Hills MULTI.rst
index 79695f1..d317f87 100644
--- a/Help/generator/Green Hills MULTI.rst
+++ b/Help/generator/Green Hills MULTI.rst
@@ -9,3 +9,8 @@ Customizations are available through the following cache variables:
* ``GHS_CUSTOMIZATION``
* ``GHS_GPJ_MACROS``
* ``GHS_OS_DIR``
+
+.. note::
+ This generator is deemed experimental as of CMake |release|.
+ Future versions of CMake may make breaking changes as the
+ generator matures.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2e650bf93d6735ea4997afffffd509f2b06d80b
commit c2e650bf93d6735ea4997afffffd509f2b06d80b
Author: Geoff Viola <geoffrey.viola at asirobots.com>
AuthorDate: Sun Apr 12 14:46:44 2015 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 13 09:47:12 2015 -0400
GHS: removed hard coded flag and cleaned cmds
diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx
index 2637675..0a116ac 100644
--- a/Source/cmGhsMultiTargetGenerator.cxx
+++ b/Source/cmGhsMultiTargetGenerator.cxx
@@ -260,8 +260,11 @@ void cmGhsMultiTargetGenerator::SetCompilerFlags(std::string const &config,
this->LocalGenerator->AddVisibilityPresetFlags(flags, this->Target, lang);
// Append old-style preprocessor definition flags.
- this->LocalGenerator->AppendFlags(flags,
+ if (std::string(" ") != std::string(this->Makefile->GetDefineFlags()))
+ {
+ this->LocalGenerator->AppendFlags(flags,
this->Makefile->GetDefineFlags());
+ }
// Add target-specific flags.
this->LocalGenerator->AddCompileOptions(flags, this->Target, lang, config);
@@ -303,43 +306,16 @@ std::string cmGhsMultiTargetGenerator::GetDefines(const std::string &language,
void cmGhsMultiTargetGenerator::WriteCompilerFlags(std::string const &,
const std::string &language)
{
- //this->Target->GetCompileOptions(options, config, language);
- static std::string const startFilePropName("-startfile_dir=");
- bool hasStartfileDirProp = false;
std::map<std::string, std::string>::iterator flagsByLangI =
this->FlagsByLanguage.find(language);
if (flagsByLangI != this->FlagsByLanguage.end())
{
- std::vector<cmsys::String> flags =
- cmSystemTools::SplitString(flagsByLangI->second, ' ');
- for (std::vector<cmsys::String>::const_iterator flagsI = flags.begin();
- flagsI != flags.end(); ++flagsI)
+ if (!flagsByLangI->second.empty())
{
- std::string flag = *flagsI;
- if (" " != flag)
- {
- if (this->DDOption != flag)
- {
- if (flag.length() >= startFilePropName.length() &&
- startFilePropName == flag.substr(0, startFilePropName.length()))
- {
- hasStartfileDirProp = true;
- }
- cmSystemTools::ConvertToUnixSlashes(flag);
- *this->GetFolderBuildStreams() << " " << flag << std::endl;
- }
- }
+ *this->GetFolderBuildStreams() << " " << flagsByLangI->second
+ << std::endl;
}
}
-
- // If this property is relative, make it relative to the root lists file
- if (!hasStartfileDirProp && this->GetGlobalGenerator()->IsOSDirRelative())
- {
- *this->GetFolderBuildStreams() << " " << startFilePropName << "\""
- << this->Makefile->GetHomeOutputDirectory()
- << "/$(__LIBS_DIR_BASE)/$(__BSP_NAME)\""
- << std::endl;
- }
}
void cmGhsMultiTargetGenerator::WriteCompilerDefinitions(
@@ -434,12 +410,16 @@ void cmGhsMultiTargetGenerator::WriteCustomCommandsHelper(
for (cmCustomCommandLine::const_iterator commandLineI = command.begin();
commandLineI != command.end(); ++commandLineI)
{
+ std::string subCommandE =
+ this->LocalGenerator->EscapeForShell(*commandLineI, true);
if (!command.empty())
{
*this->GetFolderBuildStreams()
<< (command.begin() == commandLineI ? "'" : " ");
+ //Need to double escape backslashes
+ cmSystemTools::ReplaceString(subCommandE, "\\", "\\\\");
}
- *this->GetFolderBuildStreams() << *commandLineI;
+ *this->GetFolderBuildStreams() << subCommandE;
}
if (!command.empty())
{
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx
index 8850595..d522c60 100644
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@@ -359,7 +359,6 @@ void cmGlobalGhsMultiGenerator::WriteCompilerOptions(std::string const &fOSDir)
{
*this->GetBuildFileStream() << " -os_dir=\"" << fOSDir << "\""
<< std::endl;
- *this->GetBuildFileStream() << " --link_once_templates" << std::endl;
}
void cmGlobalGhsMultiGenerator::WriteDisclaimer(std::ostream *os)
-----------------------------------------------------------------------
Summary of changes:
Help/generator/Green Hills MULTI.rst | 5 +++
.../release/dev/add-GreenHills-MULTI-generator.rst | 8 ++++
Source/cmGhsMultiTargetGenerator.cxx | 44 ++++++--------------
Source/cmGlobalGhsMultiGenerator.cxx | 1 -
4 files changed, 25 insertions(+), 33 deletions(-)
create mode 100644 Help/release/dev/add-GreenHills-MULTI-generator.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list