diff --git a/nimterop/build.nim b/nimterop/build.nim index d5ce59c..fd7ad3a 100644 --- a/nimterop/build.nim +++ b/nimterop/build.nim @@ -1138,7 +1138,7 @@ macro getHeader*( `version`* {.strdefine.} = `verVal` `lname` = when `nameStatic`: - `lre` & ".a" + `lre` & "\\.(a|lib)" else: `lre` & getDynlibExt() diff --git a/nimterop/conan.nim b/nimterop/conan.nim index 0707ecc..1a9237a 100644 --- a/nimterop/conan.nim +++ b/nimterop/conan.nim @@ -163,7 +163,15 @@ proc getConanBuilds*(pkg: ConanPackage, filter = "") = ## `filter` can be used to tweak search terms ## e.g. build_type=Debug&compiler=clang let - (arch, os, compiler, _) = getGccInfo() + (arch, os, compiler, version) = getGccInfo() + + vsplit = version.split('.') + + vfilter = + when defined(OSX): + vsplit[0 .. 1].join(".") + else: + vsplit[0] query = if pkg.bhash.len == 0: @@ -177,7 +185,8 @@ proc getConanBuilds*(pkg: ConanPackage, filter = "") = if filter.len != 0: query &= &"&{filter}" if "compiler=" notin filter and os != "windows": - query &= &"&compiler={compiler}" + query &= &"&compiler={compiler}&compiler.version=" & vfilter + query.replace("&", "%20and%20") else: "" @@ -370,4 +379,4 @@ proc getConanLibs*(pkg: ConanPackage, outdir: string): seq[string] = result.add outdir / lib for cpkg in pkg.requires: - result.add cpkg.getConanLibs(outdir) \ No newline at end of file + result.add cpkg.getConanLibs(outdir)