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

Fixed guard:ehcont project setup

Browse Source
This commit is contained in:
Sergio Ricardo Zerbetto Masson 2022-07-25 16:44:37 -03:00
parent de64926fcc
commit 664a518c31
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -173,12 +173,6 @@ if(MSVC)
string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG}) string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) string(REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
# Compiling with guard:ehcont allow library consumers to enable guard:ehcont if they want. (Requires VS 2019 x64)
if((MSVC_VERSION GREATER 1920) AND (CMAKE_SIZEOF_VOID_P EQUAL 8))
target_compile_options(GLTFSDK PRIVATE "$<$<CONFIG:RELEASE>:/guard:ehcont>")
target_link_options(GLTFSDK PRIVATE "$<$<CONFIG:RELEASE>:/guard:ehcont>")
endif()
endif() endif()
if (MINGW OR (NOT WIN32) OR VCPKG_TOOLCHAIN) if (MINGW OR (NOT WIN32) OR VCPKG_TOOLCHAIN)
@ -303,6 +297,12 @@ if(MSVC)
target_link_options(${t} PRIVATE /SAFESEH) target_link_options(${t} PRIVATE /SAFESEH)
endforeach() endforeach()
endif() endif()
# Compiling with guard:ehcont allow library consumers to enable guard:ehcont if they want. (Requires VS 2019 16.7 or later)
if((MSVC_VERSION GREATER 1928) AND (CMAKE_SIZEOF_VOID_P EQUAL 8))
target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:RELEASE>:/guard:ehcont>")
target_link_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:RELEASE>:/guard:ehcont>")
endif()
endif() endif()
if(NOT ${DIRECTX_ARCH} MATCHES "^arm") if(NOT ${DIRECTX_ARCH} MATCHES "^arm")