BUG: get correct library name
This commit is contained in:
parent
d9e38b32c3
commit
9ae8234fe5
|
@ -1199,7 +1199,11 @@ std::string cmSystemTools::CollapseFullPath(const char* in_name)
|
|||
# ifdef MAXPATHLEN
|
||||
char resolved_name[MAXPATHLEN];
|
||||
# else
|
||||
# ifdef PATH_MAX
|
||||
char resolved_name[PATH_MAX];
|
||||
# else
|
||||
char resolved_name[5024];
|
||||
# endif
|
||||
# endif
|
||||
realpath(in_name, resolved_name);
|
||||
return resolved_name;
|
||||
|
|
|
@ -450,8 +450,8 @@ void cmUnixMakefileGenerator::OutputLinkLibraries(std::ostream& fout,
|
|||
runtimeDirs.push_back( libpath );
|
||||
}
|
||||
}
|
||||
cmRegularExpression libname("lib([^.]*)\\.(.*)");
|
||||
cmRegularExpression libname_noprefix("([^.]*)\\.(.*)");
|
||||
cmRegularExpression libname("lib(.*)(\\.so|\\.sl|\\.a|\\.dylib).*");
|
||||
cmRegularExpression libname_noprefix("(.*)(\\.so|\\.sl|\\.a|\\.dylib).*");
|
||||
if(libname.find(file))
|
||||
{
|
||||
librariesLinked += "-l";
|
||||
|
|
Loading…
Reference in New Issue