summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BuildParams3
-rwxr-xr-xbuild.sh2
-rw-r--r--indra/cmake/Variables.cmake2
3 files changed, 4 insertions, 3 deletions
diff --git a/BuildParams b/BuildParams
index e1e91333d0..7f84d814d3 100644
--- a/BuildParams
+++ b/BuildParams
@@ -235,7 +235,8 @@ viewer-asset-delivery-metrics.build_server = false
viewer-asset-delivery-metrics.build_server_tests = false
#==============================================================================
-# viewer-autobuild
+# autobuild viewers
#==============================================================================
viewer-autobuild.build_link_parallel = false
+viewer-vs2010.build_link_parallel = false
# eof
diff --git a/build.sh b/build.sh
index a612a5c5cd..1eaa4a48b1 100755
--- a/build.sh
+++ b/build.sh
@@ -51,7 +51,7 @@ pre_build()
{
local variant="$1"
begin_section "Pre$variant"
- "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON
+ "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE
end_section "Pre$variant"
}
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 88cfdfc0b9..ed5e2dee2d 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -148,7 +148,7 @@ For more information, please see JIRA DEV-14943 - Cmake Linux cannot build both
endif (LINUX AND SERVER AND VIEWER)
-set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
+set(USE_PRECOMPILED_HEADERS OFF CACHE BOOL "Enable use of precompiled header directives where supported.")
source_group("CMake Rules" FILES CMakeLists.txt)