From 183d6fdb8ec5c4a6818346baf8ae4371822b4e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de> Date: Mon, 11 Jul 2022 17:58:08 +0200 Subject: [PATCH] Maybe fix hxtorch build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds googletest's lib/lib64 isntall folder explicitly to the list of libraries (it should have been found… but wasn't). --- packages/hxtorch/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py index 87b0a3d7..706047c8 100644 --- a/packages/hxtorch/package.py +++ b/packages/hxtorch/package.py @@ -85,8 +85,18 @@ class Hxtorch(WafPackage): # llvm might be built with ~shared_libs but still builds shared libs 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) + # 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('C_INCLUDE_PATH', ':'.join(include)) env.set('CPLUS_INCLUDE_PATH', ':'.join(include)) -- GitLab