kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'vs-default-ignore-libs' 

c1580a92 VS: Always add IgnoreSpecificDefaultLibraries to .vcxproj files
29410df2 cmIDEOptions: Add an AppendFlag method to update multi-valued options
This commit is contained in:
Brad King 2014-08-05 10:53:27 -04:00 committed by CMake Topic Stage
parent 6548e171e3 c1580a9217
commit 662daff0b2
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmIDEOptions.cxx
View File

@ -195,6 +195,13 @@ void cmIDEOptions::AddFlag(const char* flag,
this->FlagMap[flag] = value; this->FlagMap[flag] = value;
} }
//----------------------------------------------------------------------------
void cmIDEOptions::AppendFlag(std::string const& flag,
std::string const& value)
{
this->FlagMap[flag].push_back(value);
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmIDEOptions::RemoveFlag(const char* flag) void cmIDEOptions::RemoveFlag(const char* flag)
{ {

1
Source/cmIDEOptions.h
View File

@ -30,6 +30,7 @@ public:
void AddDefines(const std::vector<std::string> &defines); void AddDefines(const std::vector<std::string> &defines);
void AddFlag(const char* flag, const char* value); void AddFlag(const char* flag, const char* value);
void AddFlag(const char* flag, std::vector<std::string> const& value); void AddFlag(const char* flag, std::vector<std::string> const& value);
void AppendFlag(std::string const& flag, std::string const& value);
void RemoveFlag(const char* flag); void RemoveFlag(const char* flag);
const char* GetFlag(const char* flag); const char* GetFlag(const char* flag);

2
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -1864,6 +1864,8 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
{ {
linkOptions.AddFlag("ModuleDefinitionFile", def.c_str()); linkOptions.AddFlag("ModuleDefinitionFile", def.c_str());
} }
linkOptions.AppendFlag("IgnoreSpecificDefaultLibraries",
"%(IgnoreSpecificDefaultLibraries)");
} }
this->LinkOptions[config] = pOptions.release(); this->LinkOptions[config] = pOptions.release();