Skip to content

Commit 6a994c2

Browse files
committed
Fixed: Using hipjson version without duplicates and reading CL version
1 parent 1bceeff commit 6a994c2

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

dub.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"semver": {"path": "semver"},
3737
"colorize": {"path": "colorize"},
3838
"adv_diff": {"path": "adv_diff"},
39-
"hipjson": "~>1.0.10",
39+
"hipjson": "~>1.1.0",
4040
"d_dependencies": {"path": "d_dependencies"},
4141
"dub_sdl_to_json": {"path": "dub_sdl_to_json"},
4242
"package_suppliers": {"path": "package_suppliers"},

dub.selections.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"fileVersion": 1,
33
"versions": {
44
"adv_diff": {"path": "adv_diff"},
5-
"hipjson": "1.0.10",
6-
"d-segmented-hashmap": "1.0.8",
5+
"hipjson": "1.1.0",
6+
"d-segmented-hashmap": "1.1.0",
77
"murmurhash-d": "1.0.0",
8-
"intel-intrinsics": "1.12.0",
8+
"intel-intrinsics": "1.12.2",
99
"arsd-official": "12.1.0",
1010
"colorize": {"path": "colorize"},
1111
"d_dependencies": {"path": "d_dependencies"},

source/redub/tooling/compilers_inference.d

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,9 @@ private bool tryInferCl(string compilerOrPath, string vString, out CompilerBinar
259259
import redub.logging;
260260
string type = compilerOrPath.baseName.stripExtension;
261261
if(type != "cl") return false;
262-
comp = CompilerBinary(AcceptedCompiler.cl, compilerOrPath, SemVer.init, SemVer.init, vString);
262+
ptrdiff_t indexRight;
263+
string clVerStr = inBetween(vString, "Microsoft (R) C/C++ Optimizing Compiler Version ", " for ", indexRight);
264+
comp = CompilerBinary(AcceptedCompiler.cl, compilerOrPath, SemVer(clVerStr), SemVer(clVerStr), vString);
263265
warnTitle("CL Compiler detected.", " Beware that it is still very untested.");
264266
return true;
265267
}

0 commit comments

Comments
 (0)