Skip to content

Commit

Permalink
More getPathValue() uses. Fixes #42.
Browse files Browse the repository at this point in the history
  • Loading branch information
egorpugin committed May 17, 2020
1 parent 3831e99 commit 37cfa3b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/sw/client/common/command/integrate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,10 +370,10 @@ SUBCOMMAND_DECL(integrate)

// IMPORTED_LOCATION = path to .dll/.so or static .lib/.a
ctx.addLine("IMPORTED_LOCATION_" + toCmakeString(bs.Native.ConfigurationType) + " \"" +
fix_path(normalize_path(s[st == "SHARED" ? "output_file" : "import_library"].getValue())) + "\"");
fix_path(normalize_path(s[st == "SHARED" ? "output_file" : "import_library"].getPathValue(getContext().getLocalStorage()))) + "\"");
// IMPORTED_IMPLIB = path to .lib (import)
ctx.addLine("IMPORTED_IMPLIB_" + toCmakeString(bs.Native.ConfigurationType) + " \"" +
fix_path(normalize_path(s["import_library"].getValue())) + "\"");
fix_path(normalize_path(s["import_library"].getPathValue(getContext().getLocalStorage()))) + "\"");

ctx.decreaseIndent(")");
ctx.emptyLines();
Expand Down Expand Up @@ -503,7 +503,7 @@ SUBCOMMAND_DECL(integrate)
return p.parent_path() / p.stem();
};

ctx.addLine("ctx.parse_flags('-l" + normalize_path(remove_ext(s["import_library"].getValue())) + "', lib)");
ctx.addLine("ctx.parse_flags('-l" + normalize_path(remove_ext(s["import_library"].getPathValue(getContext().getLocalStorage()))) + "', lib)");

// defs
for (auto &[k, p] : s["properties"].getMap())
Expand Down

0 comments on commit 37cfa3b

Please sign in to comment.