diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-07-26 14:12:56 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-07-30 13:04:37 +0300 |
| commit | d90ac405ae50f84a3cf4ba0b806cca1c89f81cff (patch) | |
| tree | 3f66be39a80a0a32cbba332e34b418fa1fc9ad02 /build2/cc | |
| parent | e92a1aab0e1c7c9ba8e6ab9a7049207468ca53fc (diff) | |
Make project variable to be of project_name type
Diffstat (limited to 'build2/cc')
| -rw-r--r-- | build2/cc/common.cxx | 1 | ||||
| -rw-r--r-- | build2/cc/common.hxx | 2 | ||||
| -rw-r--r-- | build2/cc/pkgconfig.cxx | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx index 3c4994e..ca73483 100644 --- a/build2/cc/common.cxx +++ b/build2/cc/common.cxx @@ -444,6 +444,7 @@ namespace build2 // search (name, scope). // dir_path out; + prerequisite_key pk {n.proj, {tt, &n.dir, &out, &n.value, ext}, &s}; xt = search_library_existing (a, sysd, usrd, pk); diff --git a/build2/cc/common.hxx b/build2/cc/common.hxx index 27706f3..18824cb 100644 --- a/build2/cc/common.hxx +++ b/build2/cc/common.hxx @@ -288,7 +288,7 @@ namespace build2 bool pkgconfig_load (action, const scope&, bin::lib&, bin::liba*, bin::libs*, - const optional<string>&, + const optional<project_name>&, const string&, const dir_path&, const dir_paths&, diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx index 5ace6ec..55c8b35 100644 --- a/build2/cc/pkgconfig.cxx +++ b/build2/cc/pkgconfig.cxx @@ -456,7 +456,7 @@ namespace build2 lib& lt, liba* at, libs* st, - const optional<string>& proj, + const optional<project_name>& proj, const string& stem, const dir_path& libd, const dir_paths& top_sysd, @@ -551,7 +551,7 @@ namespace build2 if (proj) { f = dir; - f /= *proj; + f /= proj->string (); f += sfx; f += ".pc"; if (exists (f)) @@ -1102,7 +1102,7 @@ namespace build2 lib&, liba*, libs*, - const optional<string>&, + const optional<project_name>&, const string&, const dir_path&, const dir_paths&, @@ -1142,7 +1142,7 @@ namespace build2 ofdstream os (p); { - const string& n (cast<string> (rs.vars[var_project])); + const project_name& n (cast<project_name> (rs.vars[var_project])); lookup vl (rs.vars[var_version]); if (!vl) |