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.

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

Fix MSBuild integration for the host build with CMake 3.26 #88208

Merged
merged 2 commits into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions eng/native/ijw/IJW.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@ if (CLR_CMAKE_HOST_WIN32)
set_target_properties(${targetName} PROPERTIES COMPILE_OPTIONS "${compileOptions}")
endfunction()

function(add_ijw_msbuild_project_properties targetName ijwhost_target)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is ijwhost_target needed here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted a customization layer here as the name ijwhost isn't required to be the same (and the name for the fake implementation in src/tests has changed at times)

# When we're building with MSBuild, we need to set some project properties
# in case CMake has decided to use the SDK support.
# We're dogfooding things, so we need to set settings in ways that the product doesn't quite support.
# We don't actually need an installed/available target framework version here
# since we are disabling implicit framework references. We just need a valid value, and net8.0 is valid.
set_target_properties(${targetName} PROPERTIES
DOTNET_TARGET_FRAMEWORK net8.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we pass this value from the invocation script to avoid manual updates in the future? If we could capture this value

<MajorVersion>8</MajorVersion>
and wire it via, e.g. -DCLR_DOTNET_TFM=net%DotnetMajorVersion%.0, that will do the trick.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't actually need an installed/available version here since we are disabling implicit framework references. We just need a valid value. I'll add a comment.

VS_GLOBAL_DisableImplicitFrameworkReferences true
VS_GLOBAL_GenerateRuntimeConfigurationFiles false
VS_PROJECT_IMPORT "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/SetIJWProperties.props")
endfunction()

# 4365 - signed/unsigned mismatch
# 4679 - Could not import member. This is an issue with IJW and static abstract methods in interfaces.
add_compile_options(/wd4365 /wd4679)
Expand Down
6 changes: 6 additions & 0 deletions eng/native/ijw/SetIJWProperties.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Project>
<PropertyGroup>
<!-- The C++/CLI targets don't let us set this in the project file where CMake lets us set project properties, so we set it in an imported project file where it will work. -->
<UseIJWHost>false</UseIJWHost>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/native/corehost/test/ijw/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ add_library(ijw SHARED ${SOURCES})
target_link_libraries(ijw PRIVATE ${LINK_LIBRARIES_ADDITIONAL})

remove_ijw_incompatible_target_options(ijw)
add_ijw_msbuild_project_properties(ijw ijwhost)

install_with_stripped_symbols(ijw TARGETS corehost_test)
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set(SOURCES IjwCopyConstructorMarshaler.cpp)
# add the shared library
add_library (IjwCopyConstructorMarshaler SHARED ${SOURCES})
target_link_libraries(IjwCopyConstructorMarshaler PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
add_ijw_msbuild_project_properties(IjwCopyConstructorMarshaler ijwhost)

# add the install targets
install (TARGETS IjwCopyConstructorMarshaler DESTINATION bin)
1 change: 1 addition & 0 deletions src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set(SOURCES IjwNativeDll.cpp)
# add the shared library
add_library (IjwNativeDll SHARED ${SOURCES})
target_link_libraries(IjwNativeDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
add_ijw_msbuild_project_properties(IjwNativeDll ijwhost)

# add the install targets
install (TARGETS IjwNativeDll DESTINATION bin)
1 change: 1 addition & 0 deletions src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set(SOURCES IjwNativeVarargs.cpp)
# add the shared library
add_library (IjwNativeVarargs SHARED ${SOURCES})
target_link_libraries(IjwNativeVarargs PRIVATE ${LINK_LIBRARIES_ADDITIONAL})
add_ijw_msbuild_project_properties(IjwNativeVarargs ijwhost)

# add the install targets
install (TARGETS IjwNativeVarargs DESTINATION bin)