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

Merge topic 'fix-osx-framework-detection'

Browse Source 
c46490da cmSystemTools: Fix IsPathToFramework implementation (#15535)
This commit is contained in:
Brad King 2015-04-28 13:55:54 -04:00 committed by CMake Topic Stage
commit c0989eaf2a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmSystemTools.cxx
View File

@ -1486,15 +1486,8 @@ void cmSystemTools::EnableVSConsoleOutput()
bool cmSystemTools::IsPathToFramework(const char* path) bool cmSystemTools::IsPathToFramework(const char* path)
{ {
if(cmSystemTools::FileIsFullPath(path)) return (cmSystemTools::FileIsFullPath(path) &&
{ cmHasLiteralSuffix(path, ".framework"));
std::string libname = path;
if(libname.find(".framework") == libname.size()+1-sizeof(".framework"))
{
return true;
}
}
return false;
} }
bool cmSystemTools::CreateTar(const char* outFileName, bool cmSystemTools::CreateTar(const char* outFileName,