Skip to content

Commit b41eda6

Browse files
authored
Hotfix for CMake switch order (#457)
1 parent ba50281 commit b41eda6

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

build/CompilerAndLinker.cmake

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
8181

8282
if(CMAKE_INTERPROCEDURAL_OPTIMIZATION)
8383
message(STATUS "Building using Whole Program Optimization")
84-
list(APPEND /Gy /Gw)
84+
list(APPEND COMPILER_SWITCHES /Gy /Gw)
8585
endif()
8686

8787
if(OpenMP_CXX_FOUND)
8888
# OpenMP in MSVC is not compatible with /permissive- unless you disable two-phase lookup
89-
list(APPEND /Zc:twoPhase-)
89+
list(APPEND COMPILER_SWITCHES /Zc:twoPhase-)
9090
endif()
9191

9292
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
@@ -95,9 +95,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
9595

9696
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
9797
AND (NOT (XBOX_CONSOLE_TARGET STREQUAL "durango")))
98-
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
99-
target_compile_options(${t} PRIVATE /Zc:preprocessor /wd5104 /wd5105)
100-
endforeach()
98+
list(APPEND COMPILER_SWITCHES /Zc:preprocessor /wd5104 /wd5105)
10199
endif()
102100

103101
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27) AND (NOT (${DIRECTX_ARCH} MATCHES "^arm")))
@@ -110,10 +108,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
110108

111109
if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.31)
112110
AND (XBOX_CONSOLE_TARGET STREQUAL "durango"))
113-
114-
foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
115-
target_compile_options(${t} PRIVATE /Zc:static_assert-)
116-
endforeach()
111+
list(APPEND COMPILER_SWITCHES /Zc:static_assert-)
117112
endif()
118113

119114
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.35)

0 commit comments

Comments
 (0)