Skip to content

Commit

Permalink
Add back workaround of transitive private shared library dependency i…
Browse files Browse the repository at this point in the history
…ssue.

See conan-io/conan#7192 for details. virtualrunenv doesn't help for cross-compilation.
  • Loading branch information
PengZheng committed Mar 25, 2022
1 parent e371b06 commit f35dcb5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def _configure_cmake(self):
self._cmake.definitions[opt.upper()] = self.options.get_safe(opt, False)
self._cmake.definitions["CMAKE_PROJECT_Celix_INCLUDE"] = os.path.join(self.build_folder, "conan_paths.cmake")
# the following is workaround for https://github.com/conan-io/conan/issues/7192
# self._cmake.definitions["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,--unresolved-symbols=ignore-in-shared-libs"
self._cmake.definitions["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,--unresolved-symbols=ignore-in-shared-libs"
self.output.info(self._cmake.definitions)
v = tools.Version(self.version)
self._cmake.configure(defs={'CELIX_MAJOR': v.major, 'CELIX_MINOR': v.minor, 'CELIX_MICRO': v.patch})
Expand Down

0 comments on commit f35dcb5

Please sign in to comment.