Merge topic 'revert-accidental-changes'
13aea6d
cmFindCommon: Revert accidental change4064d6f
target_link_libraries: Revert accidental change
This commit is contained in:
commit
5b838ed383
|
@ -140,25 +140,14 @@ void cmFindCommon::RerootPaths(std::vector<std::string>& paths)
|
||||||
}
|
}
|
||||||
const char* rootPath =
|
const char* rootPath =
|
||||||
this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH");
|
this->Makefile->GetDefinition("CMAKE_FIND_ROOT_PATH");
|
||||||
const char* osxRootPath =
|
if((rootPath == 0) || (strlen(rootPath) == 0))
|
||||||
this->Makefile->GetDefinition("_CMAKE_OSX_SYSROOT_PATH");
|
|
||||||
const bool noRootPath = !rootPath || !*rootPath;
|
|
||||||
const bool noOSXRootPath = !osxRootPath || !*osxRootPath;
|
|
||||||
if(noRootPath && noOSXRootPath)
|
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Construct the list of path roots with no trailing slashes.
|
// Construct the list of path roots with no trailing slashes.
|
||||||
std::vector<std::string> roots;
|
std::vector<std::string> roots;
|
||||||
if(rootPath)
|
cmSystemTools::ExpandListArgument(rootPath, roots);
|
||||||
{
|
|
||||||
cmSystemTools::ExpandListArgument(rootPath, roots);
|
|
||||||
}
|
|
||||||
if(osxRootPath)
|
|
||||||
{
|
|
||||||
roots.push_back(osxRootPath);
|
|
||||||
}
|
|
||||||
for(std::vector<std::string>::iterator ri = roots.begin();
|
for(std::vector<std::string>::iterator ri = roots.begin();
|
||||||
ri != roots.end(); ++ri)
|
ri != roots.end(); ++ri)
|
||||||
{
|
{
|
||||||
|
|
|
@ -384,13 +384,8 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const char* lib,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(this->CurrentProcessingState == ProcessingLinkLibraries
|
// Handle normal case first.
|
||||||
&& !this->Target->GetProperty("LINK_INTERFACE_LIBRARIES"))
|
if(this->CurrentProcessingState != ProcessingKeywordLinkInterface
|
||||||
{
|
|
||||||
this->Makefile
|
|
||||||
->AddLinkLibraryForTarget(this->Target->GetName(), lib, llt);
|
|
||||||
}
|
|
||||||
else if(this->CurrentProcessingState != ProcessingKeywordLinkInterface
|
|
||||||
&& this->CurrentProcessingState != ProcessingPlainLinkInterface)
|
&& this->CurrentProcessingState != ProcessingPlainLinkInterface)
|
||||||
{
|
{
|
||||||
this->Makefile
|
this->Makefile
|
||||||
|
|
Loading…
Reference in New Issue