diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2020-06-26 11:16:38 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2020-06-26 11:16:38 -0400 |
| commit | e7d3b7cc9356dcf76b5f9a1bf4c9c833d180b2f8 (patch) | |
| tree | 7e5e03057675bb179625c6b45f6622b58b39a96c /indra/cmake | |
| parent | 1231cb4585290a26e29cca221f7c81fda3e2c623 (diff) | |
DRTVWR-476: On Windows, request 64-bit compiler
to avoid TeamCity build failures due to 32-bit compiler running out of virtual
memory for precompiled headers.
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 03da30649a..865c057e33 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -60,7 +60,10 @@ if (WINDOWS) # http://www.cmake.org/pipermail/cmake/2009-September/032143.html string(REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") + # Without PreferredToolArchitecture=x64, as of 2020-06-26 the 32-bit + # compiler on our TeamCity build hosts has started running out of virtual + # memory for the precompiled header file. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /p:PreferredToolArchitecture=x64") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo" |