reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-06 02:37:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use platform variable for response file flag

Browse Source 
Create platform variable "CMAKE_<LANG>_RESPONSE_FILE_LINK_FLAG" to
specify an alternative to "@" for referencing response files.  It
applies specifically to response files with linker options.

See issue #10401.
This commit is contained in:
Brad King 2010-03-11 09:03:26 -05:00
parent 87f0853941
commit f9268c9c81
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmDocumentVariables.cxx
View File

@ -1314,6 +1314,8 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
cmProperty::VARIABLE,0,0); cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_LINK_FLAGS", cm->DefineProperty("CMAKE_<LANG>_LINK_FLAGS",
cmProperty::VARIABLE,0,0); cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_RESPONSE_FILE_LINK_FLAG",
cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_STANDARD_LIBRARIES", cm->DefineProperty("CMAKE_<LANG>_STANDARD_LIBRARIES",
cmProperty::VARIABLE,0,0); cmProperty::VARIABLE,0,0);
cm->DefineProperty("CMAKE_<LANG>_STANDARD_LIBRARIES_INIT", cm->DefineProperty("CMAKE_<LANG>_STANDARD_LIBRARIES_INIT",

13
Source/cmMakefileTargetGenerator.cxx
View File

@ -1620,6 +1620,17 @@ cmMakefileTargetGenerator
std::vector<std::string> object_strings; std::vector<std::string> object_strings;
this->WriteObjectsStrings(object_strings, responseFileLimit); this->WriteObjectsStrings(object_strings, responseFileLimit);
// Lookup the response file reference flag.
std::string responseFlagVar = "CMAKE_";
responseFlagVar += this->Target->GetLinkerLanguage(this->ConfigName);
responseFlagVar += "_RESPONSE_FILE_LINK_FLAG";
const char* responseFlag =
this->Makefile->GetDefinition(responseFlagVar.c_str());
if(!responseFlag)
{
responseFlag = "@";
}
// Write a response file for each string. // Write a response file for each string.
const char* sep = ""; const char* sep = "";
for(unsigned int i = 0; i < object_strings.size(); ++i) for(unsigned int i = 0; i < object_strings.size(); ++i)
@ -1637,7 +1648,7 @@ cmMakefileTargetGenerator
sep = " "; sep = " ";
// Reference the response file. // Reference the response file.
buildObjs += "@"; buildObjs += responseFlag;
buildObjs += this->Convert(objects_rsp.c_str(), buildObjs += this->Convert(objects_rsp.c_str(),
cmLocalGenerator::NONE, cmLocalGenerator::NONE,
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);