Merge with recent viewer-2-0

2 files changed, 19 insertions, 8 deletions

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index bbf31f9297..5a142f23c9 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -19,10 +19,12 @@ if(WINDOWS)
     set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
     set(vivox_files
         SLVoice.exe
-        alut.dll
+	libsndfile-1.dll
+        vivoxplatform.dll
         vivoxsdk.dll
         ortp.dll
-        wrap_oal.dll
+        zlib1.dll
+        vivoxoal.dll
         )
 
     #*******************************
@@ -33,7 +35,6 @@ if(WINDOWS)
     set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
     set(debug_files
         openjpegd.dll
-        libtcmalloc_minimal-debug.dll
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
@@ -44,12 +45,16 @@ if(WINDOWS)
     set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
     set(release_files
         openjpeg.dll
-        libtcmalloc_minimal.dll
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
         )
 
+    if(USE_GOOGLE_PERFTOOLS)
+      set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
+      set(release_files ${release_files} libtcmalloc_minimal.dll)
+    endif(USE_GOOGLE_PERFTOOLS)
+
     if (FMOD_SDK_DIR)
         set(fmod_files fmod.dll)
     endif (FMOD_SDK_DIR)
@@ -139,9 +144,10 @@ elseif(DARWIN)
     set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/universal-darwin")
     set(vivox_files
         SLVoice
-        libalut.dylib
-        libopenal.dylib
+        libsndfile.dylib
+        libvivoxoal.dylib
         libortp.dylib
+        libvivoxplatform.dylib
         libvivoxsdk.dylib
        )
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
@@ -190,9 +196,10 @@ elseif(LINUX)
 
     set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
     set(vivox_files
-        libalut.so
-        libopenal.so.1
+        libsndfile.so.1
         libortp.so
+        libvivoxoal.so.1
+        libvivoxplatform.so
         libvivoxsdk.so
         SLVoice
        )
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 6559051b5a..db0b44eb8f 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -24,6 +24,7 @@ set(SCRIPTS_PREFIX ../scripts)
 set(SERVER_PREFIX)
 set(VIEWER_PREFIX)
 set(INTEGRATION_TESTS_PREFIX)
+set(LL_TESTS ON CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation")
 
 set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
 set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
@@ -115,4 +116,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.")
+
 source_group("CMake Rules" FILES CMakeLists.txt)