Hotfix for CMake switch order (#216)
This commit is contained in:
Родитель
8a3efc2d3f
Коммит
ca971acbce
|
@ -45,6 +45,7 @@ if(MSVC)
|
||||||
|
|
||||||
if((MSVC_VERSION GREATER_EQUAL 1928)
|
if((MSVC_VERSION GREATER_EQUAL 1928)
|
||||||
AND (CMAKE_SIZEOF_VOID_P EQUAL 8)
|
AND (CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
|
AND (NOT (TARGET OpenEXR::OpenEXR))
|
||||||
AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)))
|
AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0)))
|
||||||
list(APPEND COMPILER_SWITCHES "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
|
list(APPEND COMPILER_SWITCHES "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
|
||||||
list(APPEND LINKER_SWITCHES "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
|
list(APPEND LINKER_SWITCHES "$<$<NOT:$<CONFIG:DEBUG>>:/guard:ehcont>")
|
||||||
|
@ -80,12 +81,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||||
|
|
||||||
if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
|
if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
|
||||||
message(STATUS "Building using Whole Program Optimization")
|
message(STATUS "Building using Whole Program Optimization")
|
||||||
list(APPEND /Gy /Gw)
|
list(APPEND COMPILER_SWITCHES /Gy /Gw)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(OpenMP_CXX_FOUND)
|
if(OpenMP_CXX_FOUND)
|
||||||
# OpenMP in MSVC is not compatible with /permissive- unless you disable two-phase lookup
|
# OpenMP in MSVC is not compatible with /permissive- unless you disable two-phase lookup
|
||||||
list(APPEND /Zc:twoPhase-)
|
list(APPEND COMPILER_SWITCHES /Zc:twoPhase-)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
|
||||||
|
@ -94,9 +95,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||||
|
|
||||||
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
|
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
|
||||||
AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
|
AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
|
||||||
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
list(APPEND COMPILER_SWITCHES /Zc:preprocessor /wd5104 /wd5105)
|
||||||
target_compile_options(${t} PRIVATE /Zc:preprocessor /wd5104 /wd5105)
|
|
||||||
endforeach()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
|
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
|
||||||
|
@ -109,10 +108,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||||
|
|
||||||
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.31)
|
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.31)
|
||||||
AND (XBOX_CONSOLE_TARGET STREQUAL "durango"))
|
AND (XBOX_CONSOLE_TARGET STREQUAL "durango"))
|
||||||
|
list(APPEND COMPILER_SWITCHES /Zc:static_assert-)
|
||||||
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
|
|
||||||
target_compile_options(${t} PRIVATE /Zc:static_assert-)
|
|
||||||
endforeach()
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче