Skip to content

Commit

Permalink
Fix github compile failures due to not having the DIA SDK as part of …
Browse files Browse the repository at this point in the history 
…the VS install.

Add cvconst.h DIA SDK header to the repo and setup the includes to point to it.
  • Loading branch information
@shanepowell
shanepowell committed Dec 28, 2021
1 parent 2cda7f4 commit 5896311
Show file tree
Hide file tree
Showing 6 changed files with 4,143 additions and 17 deletions.
8 changes: 4 additions & 4 deletions AllocationSetupTests/AllocationSetupTests.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,23 @@
<LinkIncremental>true</LinkIncremental>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)x86\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)x86\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnableManifest>false</VcpkgEnableManifest>
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# DIA SDK
################################################################################
# See if the DIA SDK is available and usable.
set(MSVC_DIA_SDK_DIR "$ENV{VSINSTALLDIR}DIA SDK" CACHE PATH "Path to the DIA SDK")
set(MSVC_DIA_SDK_DIR "${CMAKE_SOURCE_DIR}/dbghelp_support_files/DIA SDK" CACHE PATH "Path to the DIA SDK")

################################################################################
# Sub-projects
Expand Down
8 changes: 4 additions & 4 deletions DbgHelpUtils/DbgHelpUtils.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)x86\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)x86\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand Down
8 changes: 4 additions & 4 deletions MiniDumper/MiniDumper.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)x86\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)x86\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnableManifest>false</VcpkgEnableManifest>
Expand Down
8 changes: 4 additions & 4 deletions ValidateHeapEntries/ValidateHeapEntries.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)x86\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)x86\$(PlatformToolset)\$(Configuration)\</OutDir>
<IncludePath>$(VSINSTALLDIR)\DIA SDK\include;$(IncludePath)</IncludePath>
<IncludePath>$(SolutionDir)dbghelp_support_files\DIA SDK\include;$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnableManifest>false</VcpkgEnableManifest>
Expand Down
Loading

0 comments on commit 5896311

Please sign in to comment.