Fix bug introduced by always including libraries

cropsinsilico · May 28, 2024 · 0a51fd1 · 0a51fd1
1 parent 3aab877
commit 0a51fd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/yggdrasil/drivers/CMakeModelDriver.py b/yggdrasil/drivers/CMakeModelDriver.py
@@ -880,8 +880,7 @@ def create_exports(cls, dep, products=None, overwrite=False,
             f'{dep.name}{suffix}Targets.cmake')
         dependencies = dep.dependency_order()
         dep_kws = {'dry_run': True}
-        dependencies.getall('dep_kwargs', to_update=dep_kws,
-                            dep_libtype=dep['libtype'])
+        dependencies.getall('dep_kwargs', to_update=dep_kws)
         if dep.result in dep_kws.get('libraries', []):
             dep_kws['libraries'].remove(dep.result)
         lines = [

diff --git a/yggdrasil/drivers/CompiledModelDriver.py b/yggdrasil/drivers/CompiledModelDriver.py
@@ -3474,7 +3474,8 @@ def _dep_libtool_kwargs(self, key, to_update=None, dep_libtype=None,
             if not os.path.isfile(dep_lib):
                 raise RuntimeError(f"Library for {self.name} dependency "
                                    f"does not exist: '{dep_lib}'.")
-        if self['libtype'] in self.library_files:
+        if ((self['libtype'] in self.library_files
+             and dep_libtype != 'static')):
             libkey = 'libraries'
             if use_library_path_internal and self.origin == 'internal':
                 if to_update.get('skip_library_libs', False):