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

CMake updates (#626)

Browse Source
This commit is contained in:
Chuck Walbourn 2025-08-11 15:36:50 -06:00 committed by GitHub
parent 4e29808301
commit 1beaa86597
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -633,9 +633,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endforeach() endforeach()
endif() endif()
set(WarningsEXE "/wd4061" "/wd4062" "/wd4365" "/wd4514" "/wd4571" "/wd4625" "/wd4626" "/wd4627" "/wd4668" "/wd4710" "/wd4711" "/wd4751" "/wd4774" "/wd4820" "/wd5026" "/wd5027" "/wd5039" "/wd5045" "/wd5219") set(WarningsEXE /wd4061 /wd4062 /wd4365 /wd4514 /wd4571 /wd4625 /wd4626 /wd4627 /wd4668 /wd4710 /wd4711 /wd4751 /wd4774 /wd4820 /wd5026 /wd5027 /wd5039 /wd5045 /wd5219)
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34) if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.34)
list(APPEND WarningsEXE "/wd5262" "/wd5264") list(APPEND WarningsEXE /wd5262 /wd5264)
endif()
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.50)
list(APPEND WarningsEXE /wd4865)
endif() endif()
foreach(t IN LISTS TOOL_EXES) foreach(t IN LISTS TOOL_EXES)
target_compile_options(${t} PRIVATE ${WarningsEXE}) target_compile_options(${t} PRIVATE ${WarningsEXE})

3
DirectXTex/DirectXTexP.h
View File

@ -13,7 +13,7 @@
#ifdef _MSC_VER #ifdef _MSC_VER
// Off by default warnings // Off by default warnings
#pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045 5219 5246 5264 26812) #pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4865 4987 5026 5027 5031 5032 5039 5045 5219 5246 5264 26812)
// C4619/4616 #pragma warning warnings // C4619/4616 #pragma warning warnings
// C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label // C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label
// C4265 class has virtual functions, but destructor is not virtual // C4265 class has virtual functions, but destructor is not virtual
@ -29,6 +29,7 @@
// C4746 volatile access of '<expression>' is subject to /volatile:<iso|ms> setting // C4746 volatile access of '<expression>' is subject to /volatile:<iso|ms> setting
// C4774 format string expected in argument 3 is not a string literal // C4774 format string expected in argument 3 is not a string literal
// C4820 padding added after data member // C4820 padding added after data member
// C4865 the underlying type will change from 'int' to 'unsigned int' when '/Zc:enumTypes' is specified on the command line
// C4987 nonstandard extension used // C4987 nonstandard extension used
// C5026 move constructor was implicitly defined as deleted // C5026 move constructor was implicitly defined as deleted
// C5027 move assignment operator was implicitly defined as deleted // C5027 move assignment operator was implicitly defined as deleted

2
build/CompilerAndLinker.cmake
View File

@ -193,7 +193,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endif() endif()
if(WINDOWS_STORE AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.32)) if(WINDOWS_STORE AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.32))
list(APPEND COMPILER_SWITCHES "/wd5246") list(APPEND COMPILER_SWITCHES /wd5246)
endif() endif()
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35) if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)