ENH: fix a bug in the find path stuff so that it can find headers deep in frameworks
This commit is contained in:
parent
6503a0eecc
commit
cb95c0a5bc
|
@ -150,26 +150,6 @@ IF (WIN32)
|
||||||
)
|
)
|
||||||
ENDIF(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(
|
MARK_AS_ADVANCED(
|
||||||
TCL_STUB_LIBRARY
|
TCL_STUB_LIBRARY
|
||||||
TCL_STUB_LIBRARY_DEBUG
|
TCL_STUB_LIBRARY_DEBUG
|
||||||
|
|
|
@ -164,24 +164,24 @@ std::string cmFindPathCommand::FindHeaderInFramework(std::string& file,
|
||||||
return fpath;
|
return fpath;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// if it is not found yet or not a framework header, then do a glob search
|
}
|
||||||
// for all files in dir/*/Headers/
|
// if it is not found yet or not a framework header, then do a glob search
|
||||||
cmStdString glob = dir;
|
// for all files in dir/*/Headers/
|
||||||
glob += "/*/Headers/";
|
cmStdString glob = dir;
|
||||||
glob += file;
|
glob += "/*/Headers/";
|
||||||
cmGlob globIt;
|
glob += file;
|
||||||
globIt.FindFiles(glob);
|
cmGlob globIt;
|
||||||
std::vector<std::string> files = globIt.GetFiles();
|
globIt.FindFiles(glob);
|
||||||
if(files.size())
|
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;
|
return fheader;
|
||||||
}
|
}
|
||||||
|
fheader = cmSystemTools::GetFilenamePath(fheader);
|
||||||
|
return fheader;
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue