File tree Expand file tree Collapse file tree 2 files changed +2
-3
lines changed Expand file tree Collapse file tree 2 files changed +2
-3
lines changed Original file line number Diff line number Diff line change 142142 <ItemGroup >
143143 <_MonoCMakeArgs Condition =" '$(MonoBuildTool)' == 'ninja'" Include =" -G Ninja" />
144144 <_MonoCMakeArgs Include =" -DCMAKE_INSTALL_PREFIX=$(MonoObjDir)out" />
145+ <_MonoCMakeArgs Include =" -DCMAKE_INSTALL_LIBDIR=lib" />
145146 <_MonoCMakeArgs Include =" -DCMAKE_BUILD_TYPE=$(Configuration)" />
146147 <_MonoCMakeArgs Condition =" '$(MonoEnableLLVM)' == 'true'" Include =" -DLLVM_PREFIX=$(MonoLLVMDir)" />
147148 </ItemGroup >
415416 <_MonoRuntimeFilePath Condition =" '$(TargetsOSX)' == 'true'" >$(MonoObjDir)out\lib\libmonosgen-2.0.dylib</_MonoRuntimeFilePath >
416417 <_MonoRuntimeFilePath Condition =" '$(TargetsiOS)' == 'true'" >$(MonoObjDir)out\lib\libmonosgen-2.0.dylib</_MonoRuntimeFilePath >
417418 <_MonoRuntimeFilePath Condition =" '$(TargetstvOS)' == 'true'" >$(MonoObjDir)out\lib\libmonosgen-2.0.dylib</_MonoRuntimeFilePath >
418- <_MonoRuntimeFilePath Condition =" '$(TargetsAndroid)' == 'true'" >$(MonoObjDir)out\lib\libmonosgen-2.0.so</_MonoRuntimeFilePath >
419419 <_MonoRuntimeFilePath Condition =" '$(TargetsBrowser)' == 'true'" >$(MonoObjDir)out\lib\libmonosgen-2.0.a</_MonoRuntimeFilePath >
420- <_MonoRuntimeFilePath Condition =" '$(_MonoRuntimeFilePath)' == ''" >$(MonoObjDir)mono\mini\.libs \libmonosgen-2.0.so</_MonoRuntimeFilePath >
420+ <_MonoRuntimeFilePath Condition =" '$(_MonoRuntimeFilePath)' == ''" >$(MonoObjDir)out\lib \libmonosgen-2.0.so</_MonoRuntimeFilePath >
421421 <_MonoRuntimeStaticFilePath Condition =" '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsAndroid)' == 'true'" >$(MonoObjDir)out\lib\libmonosgen-2.0.a</_MonoRuntimeStaticFilePath >
422422 <_MonoIncludeInterpStaticFiles Condition =" '$(TargetsBrowser)' == 'true' or ('$(TargetsiOS)' == 'true' and '$(TargetsiOSSimulator)' != 'true')" >true</_MonoIncludeInterpStaticFiles >
423423 </PropertyGroup >
Original file line number Diff line number Diff line change @@ -304,7 +304,6 @@ endif()
304304if (NOT DISABLE_SHARED_LIBS)
305305 add_library (monosgen SHARED $<TARGET_OBJECTS:monosgen-objects>)
306306 set_target_properties (monosgen PROPERTIES OUTPUT_NAME monosgen-2.0)
307- set_target_properties (monosgen PROPERTIES LIBRARY_OUTPUT_DIRECTORY .libs)
308307 target_link_libraries (monosgen ${OS_LIBS} ${ICONV_LIB} ${LLVM_LIBS} ${ICU_LIBS} )
309308 if (ICU_LDFLAGS)
310309 set_property (TARGET monosgen APPEND_STRING PROPERTY LINK_FLAGS ${ICU_LDFLAGS} )
You can’t perform that action at this time.
0 commit comments