[Cmake-commits] [cmake-commits] hoffman committed cmAddCustomCommandCommand.h 1.33.2.3 1.33.2.4 cmAddCustomTargetCommand.h 1.22.2.2 1.22.2.3 cmComputeLinkDepends.cxx 1.12.2.7 1.12.2.8 cmComputeLinkDepends.h 1.5.2.7 1.5.2.8
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Apr 7 15:32:09 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv29663/Source
Modified Files:
Tag: CMake-2-6
cmAddCustomCommandCommand.h cmAddCustomTargetCommand.h
cmComputeLinkDepends.cxx cmComputeLinkDepends.h
Log Message:
ENH: merge in changes for RC 4
Index: cmComputeLinkDepends.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkDepends.h,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -C 2 -d -r1.5.2.7 -r1.5.2.8
*** cmComputeLinkDepends.h 13 Jan 2009 18:03:51 -0000 1.5.2.7
--- cmComputeLinkDepends.h 7 Apr 2009 19:32:07 -0000 1.5.2.8
***************
*** 82,86 ****
std::map<cmStdString, int>::iterator
AllocateLinkEntry(std::string const& item);
! int AddLinkEntry(std::string const& item);
void AddVarLinkEntries(int depender_index, const char* value);
void AddTargetLinkEntries(int depender_index,
--- 82,86 ----
std::map<cmStdString, int>::iterator
AllocateLinkEntry(std::string const& item);
! int AddLinkEntry(int depender_index, std::string const& item);
void AddVarLinkEntries(int depender_index, const char* value);
void AddTargetLinkEntries(int depender_index,
***************
*** 89,93 ****
std::vector<std::string> const& libs);
std::string CleanItemName(std::string const& item);
! cmTarget* FindTargetToLink(const char* name);
// One entry for each unique item.
--- 89,93 ----
std::vector<std::string> const& libs);
std::string CleanItemName(std::string const& item);
! cmTarget* FindTargetToLink(int depender_index, const char* name);
// One entry for each unique item.
***************
*** 163,167 ****
// Compatibility help.
bool OldLinkDirMode;
! void CheckWrongConfigItem(std::string const& item);
std::set<cmTarget*> OldWrongConfigItems;
};
--- 163,167 ----
// Compatibility help.
bool OldLinkDirMode;
! void CheckWrongConfigItem(int depender_index, std::string const& item);
std::set<cmTarget*> OldWrongConfigItems;
};
Index: cmComputeLinkDepends.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkDepends.cxx,v
retrieving revision 1.12.2.7
retrieving revision 1.12.2.8
diff -C 2 -d -r1.12.2.7 -r1.12.2.8
*** cmComputeLinkDepends.cxx 13 Jan 2009 18:03:49 -0000 1.12.2.7
--- cmComputeLinkDepends.cxx 7 Apr 2009 19:32:07 -0000 1.12.2.8
***************
*** 296,300 ****
//----------------------------------------------------------------------------
! int cmComputeLinkDepends::AddLinkEntry(std::string const& item)
{
// Check if the item entry has already been added.
--- 296,301 ----
//----------------------------------------------------------------------------
! int cmComputeLinkDepends::AddLinkEntry(int depender_index,
! std::string const& item)
{
// Check if the item entry has already been added.
***************
*** 313,317 ****
LinkEntry& entry = this->EntryList[index];
entry.Item = item;
! entry.Target = this->FindTargetToLink(entry.Item.c_str());
entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
item.substr(0, 10) != "-framework");
--- 314,318 ----
LinkEntry& entry = this->EntryList[index];
entry.Item = item;
! entry.Target = this->FindTargetToLink(depender_index, entry.Item.c_str());
entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
item.substr(0, 10) != "-framework");
***************
*** 410,414 ****
LinkEntry& entry = this->EntryList[lei->second];
entry.Item = dep.Item;
! entry.Target = this->FindTargetToLink(dep.Item.c_str());
// This item was added specifically because it is a dependent
--- 411,416 ----
LinkEntry& entry = this->EntryList[lei->second];
entry.Item = dep.Item;
! entry.Target = this->FindTargetToLink(dep.DependerIndex,
! dep.Item.c_str());
// This item was added specifically because it is a dependent
***************
*** 501,505 ****
else if(this->OldLinkDirMode)
{
! this->CheckWrongConfigItem(*di);
}
--- 503,507 ----
else if(this->OldLinkDirMode)
{
! this->CheckWrongConfigItem(depender_index, *di);
}
***************
*** 530,534 ****
else if(this->OldLinkDirMode)
{
! this->CheckWrongConfigItem(li->first);
}
}
--- 532,536 ----
else if(this->OldLinkDirMode)
{
! this->CheckWrongConfigItem(depender_index, li->first);
}
}
***************
*** 559,563 ****
// Add a link entry for this item.
! int dependee_index = this->AddLinkEntry(item);
// The dependee must come after the depender.
--- 561,565 ----
// Add a link entry for this item.
! int dependee_index = this->AddLinkEntry(depender_index, item);
// The dependee must come after the depender.
***************
*** 665,672 ****
//----------------------------------------------------------------------------
! cmTarget* cmComputeLinkDepends::FindTargetToLink(const char* name)
{
! // Look for a target.
! cmTarget* tgt = this->Makefile->FindTargetToUse(name);
// Skip targets that will not really be linked. This is probably a
--- 667,683 ----
//----------------------------------------------------------------------------
! cmTarget* cmComputeLinkDepends::FindTargetToLink(int depender_index,
! const char* name)
{
! // Look for a target in the scope of the depender.
! cmMakefile* mf = this->Makefile;
! if(depender_index >= 0)
! {
! if(cmTarget* depender = this->EntryList[depender_index].Target)
! {
! mf = depender->GetMakefile();
! }
! }
! cmTarget* tgt = mf->FindTargetToUse(name);
// Skip targets that will not really be linked. This is probably a
***************
*** 988,992 ****
//----------------------------------------------------------------------------
! void cmComputeLinkDepends::CheckWrongConfigItem(std::string const& item)
{
if(!this->OldLinkDirMode)
--- 999,1004 ----
//----------------------------------------------------------------------------
! void cmComputeLinkDepends::CheckWrongConfigItem(int depender_index,
! std::string const& item)
{
if(!this->OldLinkDirMode)
***************
*** 998,1002 ****
// directories of targets linked in another configuration as link
// directories.
! if(cmTarget* tgt = this->FindTargetToLink(item.c_str()))
{
if(!tgt->IsImported())
--- 1010,1014 ----
// directories of targets linked in another configuration as link
// directories.
! if(cmTarget* tgt = this->FindTargetToLink(depender_index, item.c_str()))
{
if(!tgt->IsImported())
Index: cmAddCustomTargetCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddCustomTargetCommand.h,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -C 2 -d -r1.22.2.2 -r1.22.2.3
*** cmAddCustomTargetCommand.h 31 Mar 2009 14:29:11 -0000 1.22.2.2
--- cmAddCustomTargetCommand.h 7 Apr 2009 19:32:07 -0000 1.22.2.3
***************
*** 90,101 ****
"and outputs of custom commands created with add_custom_command() in "
"the same directory (CMakeLists.txt file).\n"
! "If VERBATIM is given then all the arguments to the commands will be "
! "passed exactly as specified no matter the build tool used. "
"Note that one level of escapes is still used by the CMake language "
"processor before add_custom_target even sees the arguments. "
"Use of VERBATIM is recommended as it enables correct behavior. "
! "When VERBATIM is not given the behavior is platform specific. "
! "In the future VERBATIM may be enabled by default. The only reason "
! "it is an option is to preserve compatibility with older CMake code."
"\n"
"The SOURCES option specifies additional source files to be included "
--- 90,101 ----
"and outputs of custom commands created with add_custom_command() in "
"the same directory (CMakeLists.txt file).\n"
! "If VERBATIM is given then all arguments to the commands will be "
! "escaped properly for the build tool so that the invoked command "
! "receives each argument unchanged. "
"Note that one level of escapes is still used by the CMake language "
"processor before add_custom_target even sees the arguments. "
"Use of VERBATIM is recommended as it enables correct behavior. "
! "When VERBATIM is not given the behavior is platform specific because "
! "there is no protection of tool-specific special characters."
"\n"
"The SOURCES option specifies additional source files to be included "
Index: cmAddCustomCommandCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddCustomCommandCommand.h,v
retrieving revision 1.33.2.3
retrieving revision 1.33.2.4
diff -C 2 -d -r1.33.2.3 -r1.33.2.4
*** cmAddCustomCommandCommand.h 31 Mar 2009 14:29:01 -0000 1.33.2.3
--- cmAddCustomCommandCommand.h 7 Apr 2009 19:32:07 -0000 1.33.2.4
***************
*** 124,135 ****
"but may be used in the future."
"\n"
! "If VERBATIM is given then all the arguments to the commands will be "
! "passed exactly as specified no matter the build tool used. "
"Note that one level of escapes is still used by the CMake language "
! "processor before ADD_CUSTOM_TARGET even sees the arguments. "
"Use of VERBATIM is recommended as it enables correct behavior. "
! "When VERBATIM is not given the behavior is platform specific. "
! "In the future VERBATIM may be enabled by default. The only reason "
! "it is an option is to preserve compatibility with older CMake code.\n"
"If the output of the custom command is not actually "
"created as a file on disk it should be marked as SYMBOLIC with "
--- 124,136 ----
"but may be used in the future."
"\n"
! "If VERBATIM is given then all arguments to the commands will be "
! "escaped properly for the build tool so that the invoked command "
! "receives each argument unchanged. "
"Note that one level of escapes is still used by the CMake language "
! "processor before add_custom_command even sees the arguments. "
"Use of VERBATIM is recommended as it enables correct behavior. "
! "When VERBATIM is not given the behavior is platform specific because "
! "there is no protection of tool-specific special characters."
! "\n"
"If the output of the custom command is not actually "
"created as a file on disk it should be marked as SYMBOLIC with "
More information about the Cmake-commits
mailing list