X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=3c3aad935f965e7c039ad68bbe3d7419afb832f6;hb=d66acc8fb6b17f1f966838a5266a04be551a284e;hp=48935bde831b341148316fa9d5e4c29e9ec998b0;hpb=f1027d55894e624df4888f9545f1e690a2adf5ae;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 48935bd..3c3aad9 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -11,23 +11,23 @@ using namespace std;
 using namespace Msp;
 
 CSourceFile::CSourceFile(Builder &b, const FS::Path &p):
-	SourceFile(b, 0, p)
+	SourceFile(b, p)
 { }
 
 CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
-	SourceFile(b, &c, p)
+	SourceFile(b, c, p)
 {
 	string ext = FS::extpart(FS::basename(path));
 	if(ext==".h" || ext==".H" || ext==".hpp")
-		install_location = "include/"+comp->get_name();
+		install_location = FS::Path("include")/component->get_name();
 }
 
 void CSourceFile::find_depends()
 {
-	if(!comp || !mtime)
+	if(!component || !mtime)
 		return;
 
-	const SourcePackage &spkg = comp->get_package();
+	const SourcePackage &spkg = component->get_package();
 	string relname = FS::relative(path, spkg.get_source()).str();
 
 	DependencyCache &deps_cache = spkg.get_deps_cache();
@@ -37,8 +37,7 @@ void CSourceFile::find_depends()
 	{
 		IO::BufferedFile in(path.str());
 
-		if(builder.get_verbose()>=4)
-			IO::print("Reading includes from %s\n", path.str());
+		builder.get_logger().log("files", format("Reading includes from %s", path.str()));
 
 		Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
@@ -50,12 +49,13 @@ void CSourceFile::find_depends()
 		deps_cache.set_deps(relname, includes);
 	}
 
-	const StringList &incpath = comp->get_build_info().incpath;
+	const BuildInfo::PathList &incpath = component->get_build_info().incpath;
+	BuildInfo::PathList local_incpath = incpath;
+	local_incpath.push_front(FS::dirname(path).str());
 
-	FS::Path dir = FS::dirname(path);
 	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr = builder.get_vfs().find_header(*i, dir, incpath);
+		Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
 		if(hdr)
 			add_depend(hdr);
 	}