Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
2f208128
R
runtime
项目概览
dotNET Platform
/
runtime
12 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2f208128
编写于
6月 29, 2023
作者:
J
Jeremy Koritzinsky
提交者:
GitHub
6月 29, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix MSBuild integration for the host build with CMake 3.26 (#88208)
上级
b41893b3
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
23 addition
and
0 deletion
+23
-0
eng/native/ijw/IJW.cmake
eng/native/ijw/IJW.cmake
+13
-0
eng/native/ijw/SetIJWProperties.props
eng/native/ijw/SetIJWProperties.props
+6
-0
src/native/corehost/test/ijw/CMakeLists.txt
src/native/corehost/test/ijw/CMakeLists.txt
+1
-0
src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt
...tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt
+1
-0
src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt
src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt
+1
-0
src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt
src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt
+1
-0
未找到文件。
eng/native/ijw/IJW.cmake
浏览文件 @
2f208128
...
...
@@ -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
)
# 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
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
)
...
...
eng/native/ijw/SetIJWProperties.props
0 → 100644
浏览文件 @
2f208128
<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>
\ No newline at end of file
src/native/corehost/test/ijw/CMakeLists.txt
浏览文件 @
2f208128
...
...
@@ -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
)
src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt
浏览文件 @
2f208128
...
...
@@ -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
)
src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt
浏览文件 @
2f208128
...
...
@@ -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
)
src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt
浏览文件 @
2f208128
...
...
@@ -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
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录