Make install_location a path

[builder.git] / source / target.h

diff --git a/source/target.h b/source/target.h
index 88642dc9ff5f446e1e30ee67e6c64a90df17c919..885ef4b567f00d69d9f04921cd5fca9c46c06568 100644 (file)
--- a/source/target.h
+++ b/source/target.h
@@ -10,12 +10,10 @@
 
 class Builder;
 class Component;
-class Package;
+class SourcePackage;
 class Task;
 class Tool;
 
-class Target;
-
 /**
 Targets make up the build graph.  This class is a base for all target types and
 handles many common tasks.  See also FileTarget and VirtualTarget.
@@ -40,14 +38,14 @@ public:
 
 protected:
        Builder &builder;
-       const Package *package;
+       const SourcePackage *package;
        const Component *component;
        std::string name;
 
        const Tool *tool;
        State state;
        std::string rebuild_reason;
-       std::string install_location;
+       Msp::FS::Path install_location;
 
        Dependencies depends;
 
@@ -57,7 +55,7 @@ public:
 
        virtual const char *get_type() const = 0;
        const std::string &get_name() const { return name; }
-       const Package *get_package() const { return package; }
+       const SourcePackage *get_package() const { return package; }
        const Component *get_component() const { return component; }
 
        /** Tries to locate a target that will help getting this target built.  If
@@ -90,7 +88,7 @@ public:
        void force_rebuild();
 
        bool is_installable() const { return !install_location.empty(); }
-       const std::string &get_install_location() const { return install_location; }
+       const Msp::FS::Path &get_install_location() const { return install_location; }
        void add_depend(Target *);
        const Dependencies &get_depends() const { return depends; }