Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pick libmonosgen-2.0.so from cmake install directory instead of .libs #44291

Merged
merged 5 commits into from
Nov 6, 2020
Merged

Pick libmonosgen-2.0.so from cmake install directory instead of .libs #44291

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ec97f1
Pick libmonosgen-2.0.so from cmake install directory instead of .libs
akoeplinger Nov 5, 2020
26a6a18
Fix path for Linux x64
akoeplinger Nov 5, 2020
8c8e737
Simplify a bit more
akoeplinger Nov 5, 2020
0e7a393
PR feedback
akoeplinger Nov 5, 2020
616e949
PR feedback
akoeplinger Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,8 @@
<_MonoRuntimeFilePath Condition="'$(TargetstvOS)' == 'true'">$(MonoObjDir)out\lib\libmonosgen-2.0.dylib</_MonoRuntimeFilePath>
<_MonoRuntimeFilePath Condition="'$(TargetsAndroid)' == 'true'">$(MonoObjDir)out\lib\libmonosgen-2.0.so</_MonoRuntimeFilePath>
<_MonoRuntimeFilePath Condition="'$(TargetsBrowser)' == 'true'">$(MonoObjDir)out\lib\libmonosgen-2.0.a</_MonoRuntimeFilePath>
akoeplinger marked this conversation as resolved.
Show resolved Hide resolved
<_MonoRuntimeFilePath Condition="'$(_MonoRuntimeFilePath)' == ''">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.so</_MonoRuntimeFilePath>
<_MonoRuntimeFilePath Condition="'$(_MonoRuntimeFilePath)' == '' and '$(TargetsLinux)' == 'true' and '$(TargetArchitecture)' == 'x64'">$(MonoObjDir)out\lib64\libmonosgen-2.0.so</_MonoRuntimeFilePath>
akoeplinger marked this conversation as resolved.
Show resolved Hide resolved
<_MonoRuntimeFilePath Condition="'$(_MonoRuntimeFilePath)' == ''">$(MonoObjDir)out\lib\libmonosgen-2.0.so</_MonoRuntimeFilePath>
akoeplinger marked this conversation as resolved.
Show resolved Hide resolved
<_MonoRuntimeStaticFilePath Condition="'$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true' or '$(TargetsAndroid)' == 'true'">$(MonoObjDir)out\lib\libmonosgen-2.0.a</_MonoRuntimeStaticFilePath>
<_MonoIncludeInterpStaticFiles Condition="'$(TargetsBrowser)' == 'true' or ('$(TargetsiOS)' == 'true' and '$(TargetsiOSSimulator)' != 'true')">true</_MonoIncludeInterpStaticFiles>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/mono/mono/mini/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ endif()
if(NOT DISABLE_SHARED_LIBS)
add_library(monosgen SHARED $<TARGET_OBJECTS:monosgen-objects>)
set_target_properties(monosgen PROPERTIES OUTPUT_NAME monosgen-2.0)
set_target_properties(monosgen PROPERTIES LIBRARY_OUTPUT_DIRECTORY .libs)
target_link_libraries(monosgen ${OS_LIBS} ${ICONV_LIB} ${LLVM_LIBS} ${ICU_LIBS})
akoeplinger marked this conversation as resolved.
Show resolved Hide resolved
if(ICU_LDFLAGS)
set_target_properties(monosgen PROPERTIES LINK_FLAGS ${ICU_LDFLAGS})
Expand Down