diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-08-19 12:37:59 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-08-22 15:30:07 +0000 |
| commit | 16e7e824724e5c74d6589714f2b1f93183563676 (patch) | |
| tree | f2e7c4901b04469e67dc3fc7f5739a37051c1a98 /share/qbs/modules/cpp/windows-msvc-base.qbs | |
| parent | 9d6267a708b966286b6b7c1a0864fdf34bde6910 (diff) | |
Use more FileInfo.joinPaths() in artifacts generators
It makes sense to use the FileInfo.joinPaths() instead of the '/'
separators in the paths, because the FileInfo.joinPaths() automatically
use the best separators for a specific platforms.
Change-Id: If518cca7f9edf0f199c146b1f22f07ddb51c1d51
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/modules/cpp/windows-msvc-base.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc-base.qbs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/share/qbs/modules/cpp/windows-msvc-base.qbs b/share/qbs/modules/cpp/windows-msvc-base.qbs index 3d4975dda..c6869462e 100644 --- a/share/qbs/modules/cpp/windows-msvc-base.qbs +++ b/share/qbs/modules/cpp/windows-msvc-base.qbs @@ -176,13 +176,14 @@ CppModule { var artifacts = []; artifacts.push({ fileTags: tags, - filePath: Utilities.getHash(input.baseDir) + "/" + input.fileName + input.cpp.objectSuffix + filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir), + input.fileName + input.cpp.objectSuffix) }); if (input.cpp.generateCompilerListingFiles) { artifacts.push({ fileTags: ["lst"], - filePath: Utilities.getHash(input.baseDir) - + "/" + input.fileName + input.cpp.compilerListingSuffix + filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir), + input.fileName + input.cpp.compilerListingSuffix) }); } return artifacts; @@ -266,11 +267,13 @@ CppModule { { fileTags: ["dynamiclibrary"].concat( product.cpp.shouldSignArtifacts ? ["codesign.signed_artifact"] : []), - filePath: product.destinationDirectory + "/" + PathTools.dynamicLibraryFilePath(product) + filePath: FileInfo.joinPaths(product.destinationDirectory, + PathTools.dynamicLibraryFilePath(product)) }, { fileTags: ["dynamiclibrary_import"], - filePath: product.destinationDirectory + "/" + PathTools.importLibraryFilePath(product), + filePath: FileInfo.joinPaths(product.destinationDirectory, + PathTools.importLibraryFilePath(product)), alwaysUpdated: false } ]; @@ -341,7 +344,8 @@ CppModule { auxiliaryInputs: ["hpp"] Artifact { - filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + ".res" + filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir), + input.completeBaseName + ".res") fileTags: ["obj"] } @@ -361,7 +365,8 @@ CppModule { Rule { inputs: ["asm"] Artifact { - filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + input.cpp.objectSuffix + filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir), + input.completeBaseName + input.cpp.objectSuffix) fileTags: ["obj"] } prepare: { |