jyapayne/nimterop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Filter compiler version, Windows .lib detection

Browse source
This commit is contained in:
Ganesh Viswanathan 2020-06-12 17:45:06 -05:00
commit 6d256d1271
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nimterop/build.nim
View file

@ -1138,7 +1138,7 @@ macro getHeader*(
`version`* {.strdefine.} = `verVal` `version`* {.strdefine.} = `verVal`
`lname` = `lname` =
when `nameStatic`: when `nameStatic`:
`lre` & ".a" `lre` & "\\.(a|lib)"
else: else:
`lre` & getDynlibExt() `lre` & getDynlibExt()

13
nimterop/conan.nim
View file

@ -163,7 +163,15 @@ proc getConanBuilds*(pkg: ConanPackage, filter = "") =
## `filter` can be used to tweak search terms ## `filter` can be used to tweak search terms
## e.g. build_type=Debug&compiler=clang ## e.g. build_type=Debug&compiler=clang
let 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 = query =
if pkg.bhash.len == 0: if pkg.bhash.len == 0:
@ -177,7 +185,8 @@ proc getConanBuilds*(pkg: ConanPackage, filter = "") =
if filter.len != 0: if filter.len != 0:
query &= &"&{filter}" query &= &"&{filter}"
if "compiler=" notin filter and os != "windows": if "compiler=" notin filter and os != "windows":
query &= &"&compiler={compiler}" query &= &"&compiler={compiler}&compiler.version=" & vfilter
query.replace("&", "%20and%20") query.replace("&", "%20and%20")
else: "" else: ""