diff options
| author | ahedberg <ahedberg@google.com> | 2019-01-28T18·06-0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28T18·06-0500 |
| commit | 89ea0c5ff34aaa5855cfc7aa41f323b8a0ef0ede (patch) | |
| tree | 380217ee9f5932ea5bf1b6543ffd74e552169904 | |
| parent | 5e0dcf72c64fae912184d2e0de87195fe8f0a425 (diff) | |
| parent | 7ec32703e26d87fed866057b5ab12b8f89e10341 (diff) | |
Merge pull request #255 from uilianries/hotfix/conan
#250 Fix library order for Conan package
| -rw-r--r-- | conanfile.py | 44 |
1 files changed, 6 insertions, 38 deletions
diff --git a/conanfile.py b/conanfile.py index d8307b4568ef..cd124aaee4bf 100644 --- a/conanfile.py +++ b/conanfile.py @@ -38,46 +38,14 @@ class AbseilConan(ConanFile): def package(self): self.copy("LICENSE", dst="licenses") - self.copy("*.h", dst="include", src="absl") - self.copy("*.inc", dst="include", src="absl") + self.copy("*.h", dst="include", src=".") + self.copy("*.inc", dst="include", src=".") self.copy("*.a", dst="lib", src=".", keep_path=False) self.copy("*.lib", dst="lib", src=".", keep_path=False) def package_info(self): - self.cpp_info.libs = ["absl_base", - "absl_synchronization", - "absl_strings", - "absl_symbolize", - "absl_malloc_internal", - "absl_time", - "absl_strings", - "absl_base", - "absl_dynamic_annotations", - "absl_spinlock_wait", - "absl_throw_delegate", - "absl_stacktrace", - "absl_int128", - "absl_span", - "test_instance_tracker_lib", - "absl_stack_consumption", - "absl_bad_any_cast", - "absl_hash", - "str_format_extension_internal", - "absl_failure_signal_handler", - "absl_str_format", - "absl_numeric", - "absl_any", - "absl_optional", - "absl_container", - "absl_debugging", - "absl_memory", - "absl_leak_check", - "absl_meta", - "absl_utility", - "str_format_internal", - "absl_variant", - "absl_examine_stack", - "absl_bad_optional_access", - "absl_algorithm"] if self.settings.os == "Linux": - self.cpp_info.libs.append("pthread") + self.cpp_info.libs = ["-Wl,--start-group"] + self.cpp_info.libs.extend(tools.collect_libs(self)) + if self.settings.os == "Linux": + self.cpp_info.libs.extend(["-Wl,--end-group", "pthread"]) |