Skip to content

Commit

Permalink
Reverts version handling in conanfile, applies undefined linker setup…
Browse files Browse the repository at this point in the history
… for macos and fixes openssl version
  • Loading branch information
pnoltes committed Apr 3, 2022
1 parent 1a27506 commit c6b047e
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ def requirements(self):
self.options['zlib'].shared = True
self.requires("libuuid/1.0.3")
self.options['libuuid'].shared = True
self.requires("openssl/[>=1.1.1n <2.0.0]")
self.requires("openssl/1.1.1n")
self.requires("libzip/[>=1.7.3 <2.0.0]")
self.options['libzip'].shared = True
self.options['openssl'].shared = True
Expand Down Expand Up @@ -229,12 +229,11 @@ def _configure_cmake(self):
# the following is workaround for https://github.com/conan-io/conan/issues/7192
if self.settings.os == "Linux":
self._cmake.definitions["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,--unresolved-symbols=ignore-in-shared-libs"
elif self.settings.os == "Macos":
self._cmake.definitions["CMAKE_EXE_LINKER_FLAGS"] = "-Wl,-undefined -Wl,dynamic_lookup"
self.output.info(self._cmake.definitions)
if self.version is not None:
v = tools.Version(self.version)
self._cmake.configure(defs={'CELIX_MAJOR': v.major, 'CELIX_MINOR': v.minor, 'CELIX_MICRO': v.patch})
else:
self._cmake.configure()
v = tools.Version(self.version)
self._cmake.configure(defs={'CELIX_MAJOR': v.major, 'CELIX_MINOR': v.minor, 'CELIX_MICRO': v.patch})
return self._cmake

def build(self):
Expand Down

0 comments on commit c6b047e

Please sign in to comment.