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

ENH: fix a bug in the find path stuff so that it can find headers deep in frameworks

This commit is contained in:
Bill Hoffman 2006-03-09 11:35:38 -05:00
parent 6503a0eecc
commit cb95c0a5bc
2 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/FindTCL.cmake
View File

@ -150,26 +150,6 @@ IF (WIN32)
)
ENDIF(WIN32)
IF(Tcl_FRAMEWORKS)
# If we are using the Tcl framework, link to it.
IF("${TCL_INCLUDE_PATH}" MATCHES "Tcl\\.framework")
SET(TCL_LIBRARY "")
ENDIF("${TCL_INCLUDE_PATH}" MATCHES "Tcl\\.framework")
IF(NOT TCL_LIBRARY)
SET (TCL_LIBRARY "-framework Tcl" CACHE FILEPATH "Tcl Framework" FORCE)
ENDIF(NOT TCL_LIBRARY)
ENDIF(Tcl_FRAMEWORKS)
IF(Tk_FRAMEWORKS)
# If we are using the Tk framework, link to it.
IF("${TK_INCLUDE_PATH}" MATCHES "Tk\\.framework")
SET(TK_LIBRARY "")
ENDIF("${TK_INCLUDE_PATH}" MATCHES "Tk\\.framework")
IF(NOT TK_LIBRARY)
SET (TK_LIBRARY "-framework Tk" CACHE FILEPATH "Tk Framework" FORCE)
ENDIF(NOT TK_LIBRARY)
ENDIF(Tk_FRAMEWORKS)
MARK_AS_ADVANCED(
TCL_STUB_LIBRARY
TCL_STUB_LIBRARY_DEBUG

30
Source/cmFindPathCommand.cxx
View File

@ -164,24 +164,24 @@ std::string cmFindPathCommand::FindHeaderInFramework(std::string& file,
return fpath;
}
}
// if it is not found yet or not a framework header, then do a glob search
// for all files in dir/*/Headers/
cmStdString glob = dir;
glob += "/*/Headers/";
glob += file;
cmGlob globIt;
globIt.FindFiles(glob);
std::vector<std::string> files = globIt.GetFiles();
if(files.size())
}
// if it is not found yet or not a framework header, then do a glob search
// for all files in dir/*/Headers/
cmStdString glob = dir;
glob += "/*/Headers/";
glob += file;
cmGlob globIt;
globIt.FindFiles(glob);
std::vector<std::string> files = globIt.GetFiles();
if(files.size())
{
cmStdString fheader = cmSystemTools::CollapseFullPath(files[0].c_str());
if(this->IncludeFileInPath)
{
cmStdString fheader = cmSystemTools::CollapseFullPath(files[0].c_str());
if(this->IncludeFileInPath)
{
return fheader;
}
fheader = cmSystemTools::GetFilenamePath(fheader);
return fheader;
}
fheader = cmSystemTools::GetFilenamePath(fheader);
return fheader;
}
return "";
}