Skip to content

Commit ca1863c

Browse files
committed
Address feedback
1 parent c16fa29 commit ca1863c

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

recipes/orcania/all/conanfile.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ def config_options(self):
3333

3434
def configure(self):
3535
if self.options.shared:
36-
del self.options.fPIC
36+
try:
37+
del self.settings.compiler.libcxx
38+
except Exception:
39+
pass
3740
try:
3841
del self.settings.compiler.libcxx
3942
except Exception:
@@ -99,17 +102,17 @@ def package(self):
99102
def _create_cmake_module_alias_targets(self, module_file, targets):
100103
content = ""
101104
for alias, aliased in targets.items():
102-
content += textwrap.dedent("""\
105+
content += textwrap.dedent(f"""\
103106
if(TARGET {aliased} AND NOT TARGET {alias})
104107
add_library({alias} INTERFACE IMPORTED)
105108
set_property(TARGET {alias} PROPERTY INTERFACE_LINK_LIBRARIES {aliased})
106109
endif()
107-
""".format(alias=alias, aliased=aliased))
110+
""")
108111
save(self, module_file, content)
109112

110113
@property
111114
def _module_file_rel_path(self):
112-
return os.path.join("lib", "cmake", "conan-official-{}-targets.cmake".format(self.name))
115+
return os.path.join("lib", "cmake", f"conan-official-{self.name}-targets.cmake")
113116

114117
@property
115118
def _variable_file_rel_path(self):

0 commit comments

Comments
 (0)