mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Backslashes are escape characters. Trying forward slashes explicitly.

Browse source
This commit is contained in:
Michael Yanni 2024-02-08 10:38:54 -08:00
parent ada9fdf32b
commit dfcb8918d4
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/finalizer/CMakeLists.txt
View file

@ -12,9 +12,9 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:
# The WiX SDK is extracted from a NuGet package using an SDK .csproj (finalizer-build) that copies the "lib" and "inc" folders to a stable location. # The WiX SDK is extracted from a NuGet package using an SDK .csproj (finalizer-build) that copies the "lib" and "inc" folders to a stable location.
# The defines below (values in ${}) are set in the finalizer.nativeproj. # The defines below (values in ${}) are set in the finalizer.nativeproj.
# See: https://github.com/dotnet/arcade/tree/main/src/Microsoft.DotNet.CMake.Sdk#common-items # See: https://github.com/dotnet/arcade/tree/main/src/Microsoft.DotNet.CMake.Sdk#common-items
include_directories(${ArtifactsDir}WixSdk\inc) include_directories(${ArtifactsDir}WixSdk/inc)
include_directories(${ArtifactsDir}obj) include_directories(${ArtifactsDir}obj)
link_directories(${ArtifactsDir}WixSdk\lib\${Platform}) link_directories(${ArtifactsDir}WixSdk/lib/${Platform})
add_compile_options(/MT) add_compile_options(/MT)

13
src/finalizer/finalizer.nativeproj
View file

@ -9,9 +9,20 @@
<!-- This will be passed through -D and referenced by the CMakeLists.txt to correctly resolve the platform specific libs. --> <!-- This will be passed through -D and referenced by the CMakeLists.txt to correctly resolve the platform specific libs. -->
<ItemGroup> <ItemGroup>
<CMakeDefines Include="Platform" Value="$(Platform)" /> <CMakeDefines Include="Platform" Value="$(Platform)" />
<CMakeDefines Include="ArtifactsDir" Value="$(ArtifactsDir)" /> <CMakeDefines Include="ArtifactsDir" Value="$([System.String]::Copy($(ArtifactsDir)).Replace('\','/'))" />
<!-- Include this item below to create a binlog for the native build. --> <!-- Include this item below to create a binlog for the native build. -->
<!-- <CMakeNativeToolArguments Include="/bl:$(ArtifactsDir)native.binlog" /> --> <!-- <CMakeNativeToolArguments Include="/bl:$(ArtifactsDir)native.binlog" /> -->
</ItemGroup> </ItemGroup>
<Target Name="FinalizerPropertyCheck" AfterTargets="Restore" BeforeTargets="Build">
<Message Text="Platform: $(Platform)" Importance="high"/>
<Message Text="ArtifactsDir: $(ArtifactsDir)" Importance="high"/>
<PropertyGroup>
<ArtDirFixed>$([System.String]::Copy($(ArtifactsDir)).Replace('\','/'))</ArtDirFixed>
</PropertyGroup>
<Message Text="ArtDirFixed: $(ArtDirFixed)" Importance="high"/>
</Target>
</Project> </Project>