diff options
| author | Callum Prentice <callum@gmail.com> | 2020-07-29 13:52:24 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-21 14:28:07 -0600 |
| commit | 64a78b8c7f82641ce58761432d04458f0ebea721 (patch) | |
| tree | 5b52a310342b0f28b3e55ad2d1d2bb1ee356d6b2 | |
| parent | 61c95231f17ded25d0b0b41cddb4e12617621c59 (diff) | |
Small change to CMake options to only enable the PreferredToolArchitecture=x64 option (required for 32bit TeamCity builds) on 32 bit builds generally - removes a ton of 'unknown option, ignored' spam in the build output
| -rw-r--r-- | indra/cmake/00-Common.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 865c057e33..fc0642bbed 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -63,7 +63,12 @@ if (WINDOWS) # 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") + # CP changed to only append the flag for 32bit builds - on 64bit builds, + # locally at least, the build output is spammed with 1000s of 'D9002' + # warnings about this switch being ignored. + if( ADDRESS_SIZE EQUAL 32 ) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /p:PreferredToolArchitecture=x64") + endif() set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Zo" |