File tree Expand file tree Collapse file tree 3 files changed +18
-10
lines changed Expand file tree Collapse file tree 3 files changed +18
-10
lines changed Original file line number Diff line number Diff line change 11<?xml version =" 1.0" encoding =" utf-8" ?>
22<Project >
3+ <PropertyGroup Condition =" $([MSBuild]::IsOSPlatform ('windows')) And '$(VSINSTALLROOT)' != '' " >
4+ <_VcvarsallPath >$(VSINSTALLROOT)\VC\Auxiliary\Build\vcvarsall.bat</_VcvarsallPath >
5+ </PropertyGroup >
6+
7+ <PropertyGroup Condition =" $([MSBuild]::IsOSPlatform ('windows')) And Exists ('$(_VcvarsallPath)') " >
8+ <NativeToolchainSupported >True</NativeToolchainSupported >
9+ </PropertyGroup >
10+
11+ <PropertyGroup Condition =" !$([MSBuild]::IsOSPlatform ('windows')) " >
12+ <NativeToolchainSupported >True</NativeToolchainSupported >
13+ </PropertyGroup >
14+
315 <Target Name =" GetNativeBuildCommands" >
4- <ItemGroup Condition =" '$(VSINSTALLROOT)' != '' And Exists('$(VSINSTALLROOT)') " >
5- <_Vcvarsall
6- Include =" $(VSINSTALLROOT)\VC\Auxiliary\Build\vcvarsall.bat"
7- />
8- </ItemGroup >
9- <PropertyGroup Condition =" '@(_Vcvarsall->Count())' != '0' " >
10- <_Vcvarsall >%(_Vcvarsall.Identity)</_Vcvarsall >
11- <PrepareNativeToolchain >call "$(_Vcvarsall)" </PrepareNativeToolchain >
16+ <PropertyGroup Condition =" Exists ('$(_VcvarsallPath)') " >
17+ <PrepareNativeToolchain >call "$(_VcvarsallPath)" </PrepareNativeToolchain >
1218 </PropertyGroup >
1319 <PropertyGroup >
1420 <CmakeGenerator Condition =" $([MSBuild]::IsOSPlatform ('windows')) " >-G "NMake Makefiles"</CmakeGenerator >
Original file line number Diff line number Diff line change 2323 <_JavaInteropNativeLib Include =" CMakeLists.txt" />
2424 </ItemGroup >
2525
26- <ItemGroup >
26+ <ItemGroup Condition = " '$(NativeToolchainSupported)' == 'True' " >
2727 <None Include =" @(_JavaInteropNativeLib->'$(OutputPath)%(Dir)$(_JavaInteropLibName)')" >
2828 <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory >
2929 <Link >%(Dir)$(_JavaInteropLibName)</Link >
6060 </Target >
6161
6262 <Target Name =" _BuildLibs"
63+ Condition =" '$(NativeToolchainSupported)' == 'True' "
6364 DependsOnTargets =" GetNativeBuildCommands;_BuildJni_c;_GetCmakeOptions"
6465 BeforeTargets =" Build"
6566 Inputs =" @(_JavaInteropNativeLib);$(MSBuildThisFileFullPath);java-interop.csproj;@(ClInclude);@(ClCompile)"
Original file line number Diff line number Diff line change 2323 <_NativeTimingLib Include =" CMakeLists.txt" />
2424 </ItemGroup >
2525
26- <ItemGroup >
26+ <ItemGroup Condition = " '$(NativeToolchainSupported)' == 'True' " >
2727 <None Include =" @(_NativeTimingLib->'$(OutputPath)%(Dir)$(_NativeTimingLibName)')" >
2828 <CopyToOutputDirectory >PreserveNewest</CopyToOutputDirectory >
2929 <Link >%(Dir)$(_NativeTimingLibName)</Link >
4040 </ItemGroup >
4141
4242 <Target Name =" _BuildLibs"
43+ Condition =" '$(NativeToolchainSupported)' == 'True' "
4344 BeforeTargets =" Build"
4445 DependsOnTargets =" GetNativeBuildCommands"
4546 Inputs =" @(_NativeTimingLib);$(MSBuildThisFileFullPath);NativeTiming.csproj;@(ClInclude);@(ClCompile)"
You can’t perform that action at this time.
0 commit comments