[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1496-g7f1a4a3
Brad King
brad.king at kitware.com
Thu Mar 27 13:44:23 EDT 2014
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 7f1a4a3930d6cc783793da4a89fa804a1785f439 (commit)
via 77b09168067d674c7124ed6c4939836bbe0306ff (commit)
via 0fc1034e4bafbcb31ff0486c28687a9654376293 (commit)
from cbd2444b399f30af625b57ca3c1b1a26ac5ec020 (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=7f1a4a3930d6cc783793da4a89fa804a1785f439
commit 7f1a4a3930d6cc783793da4a89fa804a1785f439
Merge: cbd2444 77b0916
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 27 13:44:22 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 27 13:44:22 2014 -0400
Merge topic 'link-line-quoting' into next
77b09168 Watcom: Rename single-quoting infrastructure to be Watcom-specific
0fc1034e Watcom: Correct single quote processing for linker on POSIX hosts
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77b09168067d674c7124ed6c4939836bbe0306ff
commit 77b09168067d674c7124ed6c4939836bbe0306ff
Author: Jiri Malak <malak.jiri at gmail.com>
AuthorDate: Thu Mar 27 18:20:03 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 27 13:38:09 2014 -0400
Watcom: Rename single-quoting infrastructure to be Watcom-specific
diff --git a/Modules/Platform/Windows-wcl386.cmake b/Modules/Platform/Windows-wcl386.cmake
index 359097f..617761b 100644
--- a/Modules/Platform/Windows-wcl386.cmake
+++ b/Modules/Platform/Windows-wcl386.cmake
@@ -40,8 +40,8 @@ set (CMAKE_C_STANDARD_LIBRARIES_INIT "library clbrdll.lib library plbrdll.lib l
set (CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")
foreach(type CREATE_SHARED_LIBRARY CREATE_SHARED_MODULE LINK_EXECUTABLE)
- set(CMAKE_C_${type}_USE_SINGLE_QUOTE 1)
- set(CMAKE_CXX_${type}_USE_SINGLE_QUOTE 1)
+ set(CMAKE_C_${type}_USE_WATCOM_QUOTE 1)
+ set(CMAKE_CXX_${type}_USE_WATCOM_QUOTE 1)
endforeach()
set(CMAKE_C_CREATE_IMPORT_LIBRARY
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index fc56e08..ff173f5 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2182,7 +2182,7 @@ cmLocalUnixMakefileGenerator3
//----------------------------------------------------------------------------
std::string
cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
- bool useSingleQuote)
+ bool useWatcomQuote)
{
// Split the path into its components.
std::vector<std::string> components;
@@ -2190,7 +2190,7 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
// Open the quoted result.
std::string result;
- if(useSingleQuote)
+ if(useWatcomQuote)
{
#if defined(_WIN32) && !defined(__CYGWIN__)
result = "'";
@@ -2245,7 +2245,7 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
}
// Close the quoted result.
- if(useSingleQuote)
+ if(useWatcomQuote)
{
#if defined(_WIN32) && !defined(__CYGWIN__)
result += "'";
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 0aa804a..99974ee 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -187,7 +187,7 @@ public:
cmLocalGenerator::RelativeRoot returnDir);
static std::string ConvertToQuotedOutputPath(const char* p,
- bool useSingleQuote);
+ bool useWatcomQuote);
std::string CreateMakeVariable(const std::string& sin,
const std::string& s2in);
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index a392780..701d5a0 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -290,7 +290,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
linkRuleVar += linkLanguage;
linkRuleVar += "_LINK_EXECUTABLE";
std::string linkRule = this->GetLinkRule(linkRuleVar);
- bool useSingleQuote = this->Makefile->IsOn(linkRuleVar+"_USE_SINGLE_QUOTE");
+ bool useWatcomQuote = this->Makefile->IsOn(linkRuleVar+"_USE_WATCOM_QUOTE");
std::vector<std::string> commands1;
cmSystemTools::ExpandListArgument(linkRule, real_link_commands);
if(this->Target->IsExecutableWithExports())
@@ -345,7 +345,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
std::string buildObjs;
this->CreateObjectLists(useLinkScript, false,
useResponseFileForObjects, buildObjs, depends,
- useSingleQuote);
+ useWatcomQuote);
cmLocalGenerator::RuleVariables vars;
vars.RuleLauncher = "RULE_LAUNCH_LINK";
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index eea1b02..754f62f 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -458,7 +458,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
this->Target);
}
- bool useSingleQuote = this->Makefile->IsOn(linkRuleVar+"_USE_SINGLE_QUOTE");
+ bool useWatcomQuote = this->Makefile->IsOn(linkRuleVar+"_USE_WATCOM_QUOTE");
// Determine whether a link script will be used.
bool useLinkScript = this->GlobalGenerator->GetUseLinkScript();
@@ -556,7 +556,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
std::string buildObjs;
this->CreateObjectLists(useLinkScript, useArchiveRules,
useResponseFileForObjects, buildObjs, depends,
- useSingleQuote);
+ useWatcomQuote);
cmLocalGenerator::RuleVariables vars;
vars.TargetPDB = targetOutPathPDB.c_str();
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 92dd29b..b3d3f71 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1350,7 +1350,7 @@ void
cmMakefileTargetGenerator
::WriteObjectsVariable(std::string& variableName,
std::string& variableNameExternal,
- bool useSingleQuote)
+ bool useWatcomQuote)
{
// Write a make variable assignment that lists all objects for the
// target.
@@ -1373,7 +1373,7 @@ cmMakefileTargetGenerator
*this->BuildFileStream << " " << lineContinue << "\n";
*this->BuildFileStream <<
this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str(),
- useSingleQuote);
+ useWatcomQuote);
}
*this->BuildFileStream << "\n";
@@ -1397,7 +1397,7 @@ cmMakefileTargetGenerator
<< this->Makefile->GetSafeDefinition("CMAKE_OBJECT_NAME");
*this->BuildFileStream <<
this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str(),
- useSingleQuote);
+ useWatcomQuote);
}
*this->BuildFileStream << "\n" << "\n";
}
@@ -1866,12 +1866,12 @@ cmMakefileTargetGenerator
::CreateObjectLists(bool useLinkScript, bool useArchiveRules,
bool useResponseFile, std::string& buildObjs,
std::vector<std::string>& makefile_depends,
- bool useSingleQuote)
+ bool useWatcomQuote)
{
std::string variableName;
std::string variableNameExternal;
this->WriteObjectsVariable(variableName, variableNameExternal,
- useSingleQuote);
+ useWatcomQuote);
if(useResponseFile)
{
// MSVC response files cannot exceed 128K.
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index 0e10b62..ff94660 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -114,7 +114,7 @@ protected:
// write out the variable that lists the objects for this target
void WriteObjectsVariable(std::string& variableName,
std::string& variableNameExternal,
- bool useSingleQuote);
+ bool useWatcomQuote);
void WriteObjectsString(std::string& buildObjs);
void WriteObjectsStrings(std::vector<std::string>& objStrings,
std::string::size_type limit = std::string::npos);
@@ -174,7 +174,7 @@ protected:
void CreateObjectLists(bool useLinkScript, bool useArchiveRules,
bool useResponseFile, std::string& buildObjs,
std::vector<std::string>& makefile_depends,
- bool useSingleQuote);
+ bool useWatcomQuote);
void AddIncludeFlags(std::string& flags, const std::string& lang);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0fc1034e4bafbcb31ff0486c28687a9654376293
commit 0fc1034e4bafbcb31ff0486c28687a9654376293
Author: Jiri Malak <malak.jiri at gmail.com>
AuthorDate: Wed Mar 26 23:34:17 2014 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 27 13:36:58 2014 -0400
Watcom: Correct single quote processing for linker on POSIX hosts
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 7e55838..fc56e08 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2182,14 +2182,26 @@ cmLocalUnixMakefileGenerator3
//----------------------------------------------------------------------------
std::string
cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
- const char* quote)
+ bool useSingleQuote)
{
// Split the path into its components.
std::vector<std::string> components;
cmSystemTools::SplitPath(p, components);
// Open the quoted result.
- std::string result = quote;
+ std::string result;
+ if(useSingleQuote)
+ {
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ result = "'";
+#else
+ result = "\"'";
+#endif
+ }
+ else
+ {
+ result = "\"";
+ }
// Return an empty path if there are no components.
if(!components.empty())
@@ -2233,7 +2245,18 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
}
// Close the quoted result.
- result += quote;
+ if(useSingleQuote)
+ {
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ result += "'";
+#else
+ result += "'\"";
+#endif
+ }
+ else
+ {
+ result += "\"";
+ }
return result;
}
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 2871cba..0aa804a 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -187,7 +187,7 @@ public:
cmLocalGenerator::RelativeRoot returnDir);
static std::string ConvertToQuotedOutputPath(const char* p,
- const char* quote);
+ bool useSingleQuote);
std::string CreateMakeVariable(const std::string& sin,
const std::string& s2in);
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 4ebd334..92dd29b 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1354,7 +1354,6 @@ cmMakefileTargetGenerator
{
// Write a make variable assignment that lists all objects for the
// target.
- char const* quote = (useSingleQuote) ? "'" : "\"";
variableName =
this->LocalGenerator->CreateMakeVariable(this->Target->GetName(),
"_OBJECTS");
@@ -1373,7 +1372,8 @@ cmMakefileTargetGenerator
{
*this->BuildFileStream << " " << lineContinue << "\n";
*this->BuildFileStream <<
- this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str(), quote);
+ this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str(),
+ useSingleQuote);
}
*this->BuildFileStream << "\n";
@@ -1396,7 +1396,8 @@ cmMakefileTargetGenerator
<< " " << lineContinue << "\n"
<< this->Makefile->GetSafeDefinition("CMAKE_OBJECT_NAME");
*this->BuildFileStream <<
- this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str(), quote);
+ this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str(),
+ useSingleQuote);
}
*this->BuildFileStream << "\n" << "\n";
}
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Windows-wcl386.cmake | 4 ++--
Source/cmLocalUnixMakefileGenerator3.cxx | 29 +++++++++++++++++++++---
Source/cmLocalUnixMakefileGenerator3.h | 2 +-
Source/cmMakefileExecutableTargetGenerator.cxx | 4 ++--
Source/cmMakefileLibraryTargetGenerator.cxx | 4 ++--
Source/cmMakefileTargetGenerator.cxx | 13 ++++++-----
Source/cmMakefileTargetGenerator.h | 4 ++--
7 files changed, 42 insertions(+), 18 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list