summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-08-24 15:58:04 -0600
committerDave Houlton <euclid@lindenlab.com>2020-08-24 15:58:04 -0600
commit7a2237a3a6815676cdaf3929f7fe36ef2649281a (patch)
treed98b995945f30e99da3013c3557b41d6eb634b96 /indra/cmake
parent0af47fe707bee4f07cfa81f1e3edbe73b250e53e (diff)
DRTVWR-497 restore parallel builds for x64 VS2017
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/00-Common.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index fc0642bbed..8aea50e02b 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -66,8 +66,9 @@ if (WINDOWS)
# 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.
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
if( ADDRESS_SIZE EQUAL 32 )
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /p:PreferredToolArchitecture=x64")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /p:PreferredToolArchitecture=x64")
endif()
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO