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

ENH: Use CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES from platform files to block link directories.

Browse Source
This commit is contained in:
Brad King 2007-05-18 11:36:23 -04:00
parent 15a7414a60
commit 92c0f41251
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Platform/UnixPaths.cmake
View File

@ -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
)

14
Source/cmLocalGenerator.cxx
View File

@ -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 =