Skip to content

Commit

Permalink
More robust handling of module system library dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
adamrehn committed Jul 23, 2020
1 parent b9c7820 commit 815d1f6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions conan_ue4cli/data/packages/ue4lib/ue4lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ def libs(self):
"""
return self.details.resolveRoot(self.details.libs, self.engineRoot)

def systemlibs(self):
"""
Returns the list of system library files for this library
"""
return self.details.systemLibs

def defines(self):
"""
Returns the preprocessor definitions for this library
Expand Down
4 changes: 2 additions & 2 deletions conan_ue4cli/data/wrapper_template/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def package(self):

# Copy any static library files into our package, ignoring shared libraries
# and gathering a list of any system libraries that need to be linked against
systemLibs = []
systemLibs = details.systemlibs()
for lib in details.libs():

# Determine if this is a system library
Expand Down Expand Up @@ -83,7 +83,7 @@ def package_info(self):

# Export our static libraries and system libraries
self.cpp_info.libs = tools.collect_libs(self)
self.cpp_info.libs.extend(flags['systemlibs'])
self.cpp_info.system_libs = flags['systemlibs']

# Perform any package-specific post-info logic
PackageDelegate.post_info(self)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
install_requires = [
'conan>=1.7.4',
'setuptools',
'ue4cli>=0.0.24',
'ue4cli>=0.0.47',
'wheel'
],
package_data = {
Expand Down

0 comments on commit 815d1f6

Please sign in to comment.