3 files changed, 7 insertions, 7 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index ec076837f4..eb0eff2f54 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -209,7 +209,7 @@ if (LINUX OR DARWIN)
   endif (CMAKE_CXX_COMPILER MATCHES ".*clang")
 
   if (CMAKE_COMPILER_IS_GNUCXX)
-  set(GCC_WARNINGS "-Wall -Wno-trigraphs")
+    set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
   elseif (CMAKE_COMPILER_IS_CLANGXX)
     set(GCC_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs")
   endif()
diff --git a/indra/cmake/BerkeleyDB.cmake b/indra/cmake/BerkeleyDB.cmake
index 5f6b644a15..ee670ac650 100755
--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -1,5 +1,5 @@
 # -*- cmake -*-
-
+include(Prebuilt)
 set(DB_FIND_QUIETLY ON)
 set(DB_FIND_REQUIRED ON)
 
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 28202f85d6..a1a9ff55f5 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -233,11 +233,11 @@ elseif(LINUX)
 
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
-        libsndfile.so.1
-        libortp.so
-        libvivoxoal.so.1
-        libvivoxplatform.so
-        libvivoxsdk.so
+        libsndfile.dylib
+        libortp.dylib
+        libvivoxoal.dylib
+        libvivoxplatform.dylib
+        libvivoxsdk.dylib
         SLVoice
         # ca-bundle.crt   #No cert for linux.  It is actually still 3.2SDK.
        )