Skip to content
Snippets Groups Projects
Commit 183d6fdb authored by Eric Müller's avatar Eric Müller :mountain_bicyclist:
Browse files

Maybe fix hxtorch build

This adds googletest's lib/lib64 isntall folder explicitly to the list
of libraries (it should have been found… but wasn't).
parent 25b7f8e6
No related branches found
No related tags found
No related merge requests found
...@@ -85,8 +85,18 @@ class Hxtorch(WafPackage): ...@@ -85,8 +85,18 @@ class Hxtorch(WafPackage):
# llvm might be built with ~shared_libs but still builds shared libs # llvm might be built with ~shared_libs but still builds shared libs
if not any('llvm' in lib for lib in library): if not any('llvm' in lib for lib in library):
print("libs: manually adding ", self.spec['llvm'].prefix.lib)
library.append(self.spec['llvm'].prefix.lib) library.append(self.spec['llvm'].prefix.lib)
# explicitly add googletest library if it isn't found above
if not any('googletest' in lib for lib in library):
if os.path.isdir(self.spec['googletest'].prefix.lib64):
print("libs: manually adding ", self.spec['googletest'].prefix.lib64)
library.append(self.spec['googletest'].prefix.lib64)
if os.path.isdir(self.spec['googletest'].prefix.lib):
print("libs: manually adding ", self.spec['googletest'].prefix.lib)
library.append(self.spec['googletest'].prefix.lib)
env.set('CPATH', ':'.join(include)) env.set('CPATH', ':'.join(include))
env.set('C_INCLUDE_PATH', ':'.join(include)) env.set('C_INCLUDE_PATH', ':'.join(include))
env.set('CPLUS_INCLUDE_PATH', ':'.join(include)) env.set('CPLUS_INCLUDE_PATH', ':'.join(include))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment