Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-09 11:40:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CMake problem with /Zc:templateScope on older Windows SDKs (#363)

Browse Source
This commit is contained in:
Chuck Walbourn 2023-06-12 14:32:36 -07:00 committed by GitHub
parent 0dd5933058
commit 2395b804ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -472,7 +472,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35) if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME}) foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
target_compile_options(${t} PRIVATE /Zc:templateScope /Zc:checkGwOdr) target_compile_options(${t} PRIVATE /Zc:checkGwOdr $<$<VERSION_GREATER_EQUAL:${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION},10.0.22000>:/Zc:templateScope>)
endforeach() endforeach()
endif() endif()

2
DirectXTex/d3dx12.h
View File

@ -761,7 +761,7 @@ struct CD3DX12_HEAP_PROPERTIES : public D3D12_HEAP_PROPERTIES
bool IsCPUAccessible() const noexcept bool IsCPUAccessible() const noexcept
{ {
return Type == D3D12_HEAP_TYPE_UPLOAD || Type == D3D12_HEAP_TYPE_READBACK return Type == D3D12_HEAP_TYPE_UPLOAD || Type == D3D12_HEAP_TYPE_READBACK
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 609) #if 0
|| Type == D3D12_HEAP_TYPE_GPU_UPLOAD || Type == D3D12_HEAP_TYPE_GPU_UPLOAD
#endif #endif
|| (Type == D3D12_HEAP_TYPE_CUSTOM && || (Type == D3D12_HEAP_TYPE_CUSTOM &&