TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

eliminate spurious warnings

Browse Source
This commit is contained in:
David Rose 2004-10-05 22:23:45 +00:00
parent 107d69ef37
commit 4a2e38b2fa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ppremake/ppDirectory.cxx
View File

@ -357,7 +357,8 @@ get_dependable_file(const string &filename, bool is_header) {
if (!unique) { if (!unique) {
PPDependableFile *other = main_tree->find_dependable_file(filename); PPDependableFile *other = main_tree->find_dependable_file(filename);
if (_tree != main_tree) { if (_tree != main_tree &&
other->get_directory()->get_tree() != main_tree) {
// Both files are in external dependable trees. // Both files are in external dependable trees.
cerr << "Warning: header file " << dependable->get_fullpath() cerr << "Warning: header file " << dependable->get_fullpath()
<< " may be confused with " << other->get_fullpath() << " may be confused with " << other->get_fullpath()
@ -365,10 +366,9 @@ get_dependable_file(const string &filename, bool is_header) {
} else if (other->get_directory()->get_tree() != _tree) { } else if (other->get_directory()->get_tree() != _tree) {
// This file is a source file in this tree, while the other // This file is a source file in this tree, while the other
// one is an external file. // one is an external file. This is not a warning condition,
cerr << "Warning: source file " << dependable->get_pathname() // since maybe we've already installed the source file to the
<< " may be confused with " << other->get_fullpath() // global install directory on some previous build.
<< ".\n";
} else { } else {
// Both files are within the same source tree. // Both files are within the same source tree.