ENH: Use CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES from platform files to block link directories.
This commit is contained in:
parent
15a7414a60
commit
92c0f41251
@ -31,3 +31,9 @@ SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
|
|||||||
SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
||||||
/bin /usr/bin /usr/local/bin /usr/pkg/bin /sbin
|
/bin /usr/bin /usr/local/bin /usr/pkg/bin /sbin
|
||||||
)
|
)
|
||||||
|
|
||||||
|
SET(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||||
|
${CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES}
|
||||||
|
/lib /usr/lib /usr/lib32 /usr/lib64
|
||||||
|
)
|
||||||
|
|
||||||
|
@ -1512,9 +1512,17 @@ void cmLocalGenerator::OutputLinkLibraries(std::ostream& fout,
|
|||||||
|
|
||||||
// Some search paths should never be emitted
|
// Some search paths should never be emitted
|
||||||
emitted.insert("");
|
emitted.insert("");
|
||||||
emitted.insert("/usr/lib");
|
if(const char* implicitLinks =
|
||||||
emitted.insert("/usr/lib32");
|
(this->Makefile->GetDefinition
|
||||||
emitted.insert("/usr/lib64");
|
("CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES")))
|
||||||
|
{
|
||||||
|
std::vector<std::string> implicitLinkVec;
|
||||||
|
cmSystemTools::ExpandListArgument(implicitLinks, implicitLinkVec);
|
||||||
|
for(unsigned int k = 0; k < implicitLinkVec.size(); ++k)
|
||||||
|
{
|
||||||
|
emitted.insert(implicitLinkVec[k]);
|
||||||
|
}
|
||||||
|
}
|
||||||
std::string libPathFlag =
|
std::string libPathFlag =
|
||||||
this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
|
this->Makefile->GetRequiredDefinition("CMAKE_LIBRARY_PATH_FLAG");
|
||||||
std::string libLinkFlag =
|
std::string libLinkFlag =
|
||||||
|
Loading…
x
Reference in New Issue
Block a user