File tree Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Expand file tree Collapse file tree 1 file changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -33,7 +33,10 @@ def config_options(self):
33
33
34
34
def configure (self ):
35
35
if self .options .shared :
36
- del self .options .fPIC
36
+ try :
37
+ del self .settings .compiler .libcxx
38
+ except Exception :
39
+ pass
37
40
try :
38
41
del self .settings .compiler .libcxx
39
42
except Exception :
@@ -99,17 +102,17 @@ def package(self):
99
102
def _create_cmake_module_alias_targets (self , module_file , targets ):
100
103
content = ""
101
104
for alias , aliased in targets .items ():
102
- content += textwrap .dedent ("""\
105
+ content += textwrap .dedent (f """\
103
106
if(TARGET { aliased } AND NOT TARGET { alias } )
104
107
add_library({ alias } INTERFACE IMPORTED)
105
108
set_property(TARGET { alias } PROPERTY INTERFACE_LINK_LIBRARIES { aliased } )
106
109
endif()
107
- """ . format ( alias = alias , aliased = aliased ) )
110
+ """ )
108
111
save (self , module_file , content )
109
112
110
113
@property
111
114
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" )
113
116
114
117
@property
115
118
def _variable_file_rel_path (self ):
You can’t perform that action at this time.
0 commit comments