indra/cmake/00-Common.cmake

@@ -2,204 +2,309 @@
 #
 # Compilation options shared by all Second Life components.
 
+#*****************************************************************************
+#   It's important to realize that CMake implicitly concatenates
+#   CMAKE_CXX_FLAGS with (e.g.) CMAKE_CXX_FLAGS_RELEASE for Release builds. So
+#   set switches in CMAKE_CXX_FLAGS that should affect all builds, but in
+#   CMAKE_CXX_FLAGS_RELEASE or CMAKE_CXX_FLAGS_RELWITHDEBINFO for switches
+#   that should affect only that build variant.
+#
+#   Also realize that CMAKE_CXX_FLAGS may already be partially populated on
+#   entry to this file.
+#*****************************************************************************
+
 if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
 set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
 
-include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
 include(Variables)
 
 # Portable compilation flags.
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DADDRESS_SIZE=${ADDRESS_SIZE}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DADDRESS_SIZE=${ADDRESS_SIZE}")
 set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
 set(CMAKE_CXX_FLAGS_RELEASE
-    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG") 
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
     "-DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
-# Configure crash reporting
-option(RELEASE_CRASH_REPORTING "Enable use of crash reporting in release builds" OFF)
-option(NON_RELEASE_CRASH_REPORTING "Enable use of crash reporting in developer builds" OFF)
-
-if(RELEASE_CRASH_REPORTING)
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DLL_SEND_CRASH_REPORTS=1")
-endif()
-
-if(NON_RELEASE_CRASH_REPORTING)
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DLL_SEND_CRASH_REPORTS=1")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLL_SEND_CRASH_REPORTS=1")
-endif()  
-
 # Don't bother with a MinSizeRel build.
-set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
-    "Supported build types." FORCE)
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+  set(CMAKE_CONFIGURATION_TYPES "Release" CACHE STRING
+      "Supported build types." FORCE)
+else()
+  set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
+      "Supported build types." FORCE)
+endif()
 
 # Platform-specific compilation flags.
 if (WINDOWS)
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
 
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1"
-      CACHE STRING "C++ compiler debug options" FORCE)
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob0 -D_SECURE_STL=0"
-      CACHE STRING "C++ compiler release-with-debug options" FORCE)
-  set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Oi /Ot /Zi /Zo /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
-      CACHE STRING "C++ compiler release options" FORCE)
-
-  if (WORD_SIZE EQUAL 32)
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
+  elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m${ADDRESS_SIZE}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${ADDRESS_SIZE}")
+  endif ()
+
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /EHsc -D_SCL_SECURE_NO_WARNINGS=1")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /Ob0 /EHsc -D_ITERATOR_DEBUG_LEVEL=0")
+
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    set(CMAKE_CXX_FLAGS_RELEASE
+        "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Oi /Ot /Gy /Zi /MD /Ob3 /Oy- /Zc:inline /EHsc /fp:fast -D_ITERATOR_DEBUG_LEVEL=0")
+  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS_RELEASE
+        "${CMAKE_CXX_FLAGS_RELEASE} /clang:-Ofast /clang:-ffast-math /Oi /Ot /Gy /Zi /MD /Ob2 /Oy- /Zc:inline /EHsc /fp:fast -D_ITERATOR_DEBUG_LEVEL=0")
+  endif()
+
+  if (ADDRESS_SIZE EQUAL 32)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
-  endif (WORD_SIZE EQUAL 32)
-
-  if (USE_LTO AND NOT INCREMENTAL_LINK)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF /LTCG")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF /LTCG")
-    set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
-  elseif (INCREMENTAL_LINK AND NOT USE_LTO)
-    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS} /INCREMENTAL /VERBOSE:INCR")
-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL /VERBOSE:INCR")
+  endif (ADDRESS_SIZE EQUAL 32)
+
+  if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR FULL_DEBUG_SYMS OR USE_CRASHPAD)
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FULL")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FULL")
   else ()
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /INCREMENTAL:NO")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /INCREMENTAL:NO")
-  endif (USE_LTO AND NOT INCREMENTAL_LINK)
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FASTLINK")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FASTLINK")
+  endif ()
+
+  set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:LIBCMT")
+  set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:MSVCRT")
+  set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:LIBCMT")
+  set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:MSVCRT")
+  
+  if (USE_LTO)
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+      if(INCREMENTAL_LINK)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG:incremental")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG:incremental")
+        set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
+      else(INCREMENTAL_LINK)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
+        set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
+      endif(INCREMENTAL_LINK)
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /Gw")
+    elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+      if(INCREMENTAL_LINK)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto=thin -fwhole-program-vtables /clang:-fforce-emit-vtables")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=thin -fwhole-program-vtables /clang:-fforce-emit-vtables")
+      else(INCREMENTAL_LINK)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto=full -fwhole-program-vtables /clang:-fforce-emit-vtables")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=full -fwhole-program-vtables /clang:-fforce-emit-vtables")
+      endif(INCREMENTAL_LINK)
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF")
+    endif()
+  elseif (INCREMENTAL_LINK)
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /INCREMENTAL")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /INCREMENTAL")
+  else ()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+  endif ()
+
+  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    # This is a massive hack and makes me sad. clang-cl fails to find its own builtins library :/ x64 only for now.
+    set(CLANG_RT_NAMES clang_rt.builtins-x86_64)
+    find_library(CLANG_RT NAMES ${CLANG_RT_NAMES} 
+                PATHS [HKEY_LOCAL_MACHINE\\SOFTWARE\\LLVM\\LLVM]/lib/clang/${CMAKE_CXX_COMPILER_VERSION}/lib/windows 
+                [HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM]/lib/clang/${CMAKE_CXX_COMPILER_VERSION}/lib/windows)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /defaultlib:\"${CLANG_RT}\"")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /defaultlib:\"${CLANG_RT}\"")
+  endif()
+
+  set(GLOBAL_CXX_FLAGS 
+      "/GS /W3 /c /Zc:__cplusplus  /Zc:forScope /Zc:rvalueCast /Zc:strictStrings /Zc:ternary /Zc:wchar_t /nologo"
+      )
+
+  if (USE_AVX2)
+    set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /arch:AVX2")
+    add_definitions(/DAL_AVX2=1 /DAL_AVX=1)
+  elseif (ADDRESS_SIZE EQUAL 64)
+    set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /arch:AVX")
+    add_definitions(/DAL_AVX=1)
+  elseif (ADDRESS_SIZE EQUAL 32)
+    set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /arch:SSE2")
+  endif ()
+
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /Zc:externConstexpr /Zc:referenceBinding /Zc:throwingNew")
+  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /Qvec /Zc:dllexportInlines- /clang:-mprefer-vector-width=128 -fno-strict-aliasing -Wno-ignored-pragma-intrinsic -Wno-unused-local-typedef")
+  endif()
+
+  if(FAVOR_AMD AND FAVOR_INTEL)
+      message(FATAL_ERROR "Cannot enable FAVOR_AMD and FAVOR_INTEL at the same time")
+  elseif(FAVOR_AMD)
+      set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /favor:AMD64")
+  elseif(FAVOR_INTEL)
+      set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /favor:INTEL64")
+  endif()
+
+  if (NOT VS_DISABLE_FATAL_WARNINGS)
+    set(GLOBAL_CXX_FLAGS "${GLOBAL_CXX_FLAGS} /WX")
+  endif (NOT VS_DISABLE_FATAL_WARNINGS)
 
-  set(CMAKE_CXX_STANDARD_LIBRARIES "")
-  set(CMAKE_C_STANDARD_LIBRARIES "")
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${GLOBAL_CXX_FLAGS}" CACHE STRING "C++ compiler debug options" FORCE)
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${GLOBAL_CXX_FLAGS}" CACHE STRING "C++ compiler release-with-debug options" FORCE)
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GLOBAL_CXX_FLAGS}" CACHE STRING "C++ compiler release options" FORCE)
 
   add_definitions(
       /DLL_WINDOWS=1
       /DNOMINMAX
       /DUNICODE
+      /DURI_STATIC_BUILD
       /D_UNICODE
       /D_CRT_SECURE_NO_WARNINGS
+      /D_CRT_NONSTDC_NO_DEPRECATE
       /D_WINSOCK_DEPRECATED_NO_WARNINGS
+      /D_SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING
+      /DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
       )
 
-  add_compile_options(
-      /GS
-      /TP
-      /W3
-      /c
-      /Zc:wchar_t
-      /Zc:forScope
-      /nologo
-      /Oy-
-      /fp:fast
-      /Zm140
-      )
-
-  if (USE_LTO AND NOT INCREMENTAL_LINK)
-    add_compile_options(
-        /GL
-        /Gy
-        /Gw
-        )
-  endif (USE_LTO AND NOT INCREMENTAL_LINK)
-
-  if (USE_AVX)
-    add_compile_options(/arch:AVX)
-  elseif (USE_AVX2)
-    add_compile_options(/arch:AVX2)
-  elseif (WORD_SIZE EQUAL 32)
-    add_compile_options(/arch:SSE2)
-  endif (USE_AVX)
-
-  if (NOT VS_DISABLE_FATAL_WARNINGS)
-    add_compile_options(/WX)
-  endif (NOT VS_DISABLE_FATAL_WARNINGS)
+  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    add_definitions(-DBOOST_USE_WINDOWS_H)
+  endif()
 
-  # configure win32 API for windows vista+ compatibility
-  set(WINVER "0x0600" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
+  # configure win32 API for 7 and above compatibility
+  set(WINVER "0x0601" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
   add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
 endif (WINDOWS)
 
 
 if (LINUX)
-  option(CONSERVE_MEMORY "Optimize for memory usage during link stage for memory-starved systems" OFF)
   set(CMAKE_SKIP_RPATH TRUE)
-  add_definitions(
-      -DLL_LINUX=1
-      -DAPPID=secondlife
-      -DLL_IGNORE_SIGCHLD
-      -D_REENTRANT
-      -fvisibility=hidden
-      -fexceptions
-      -fno-math-errno
-      -fno-strict-aliasing
-      -fsigned-char
-      -std=gnu++11
-      -g
-      -pthread
-      )
 
-  CHECK_C_COMPILER_FLAG(-Og HAS_DEBUG_OPTIMIZATION)
-  CHECK_C_COMPILER_FLAG(-fstack-protector-strong HAS_STRONG_STACK_PROTECTOR)
-  CHECK_C_COMPILER_FLAG(-fstack-protector HAS_STACK_PROTECTOR)
+  add_compile_options(
+    -fvisibility=hidden
+    -fexceptions
+    -fno-math-errno
+    -fno-strict-aliasing
+    -fsigned-char
+    -g
+    -pthread
+    -msse4.2
+    )
 
-  if (USE_LTO)
-    add_definitions(-flto=8)
-  endif (USE_LTO)  
+  add_definitions(
+    -DLL_LINUX=1
+    -DAPPID=secondlife
+    -DLL_IGNORE_SIGCHLD
+    -D_REENTRANT
+    -DGDK_DISABLE_DEPRECATED 
+    -DGTK_DISABLE_DEPRECATED
+    -DGSEAL_ENABLE
+    -DGTK_DISABLE_SINGLE_INCLUDES
+    )
 
+  if (USE_LTO)
+    add_compile_options(-flto=8)
+  endif (USE_LTO)
+
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    if (USE_ASAN)
+      add_compile_options(-fsanitize=address)
+      link_libraries(-lasan)
+    endif (USE_ASAN)
+
+    if (USE_LEAKSAN)
+      add_compile_options(-fsanitize=leak)
+      link_libraries(-llsan)
+    endif (USE_LEAKSAN)
+
+    if (USE_UBSAN)
+      add_compile_options(-fsanitize=undefined -fno-sanitize=vptr)
+      link_libraries(-lubsan)
+    endif (USE_UBSAN)
+
+    if (USE_THDSAN)
+      add_compile_options(-fsanitize=thread)
+    endif (USE_THDSAN)
+  endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+
+  CHECK_CXX_COMPILER_FLAG(-Og HAS_DEBUG_OPTIMIZATION)
+  CHECK_CXX_COMPILER_FLAG(-fstack-protector-strong HAS_STRONG_STACK_PROTECTOR)
+  CHECK_CXX_COMPILER_FLAG(-fstack-protector HAS_STACK_PROTECTOR)
   if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
     if(HAS_STRONG_STACK_PROTECTOR)
-      add_definitions(-fstack-protector-strong)
+      add_compile_options(-fstack-protector-strong)
     elseif(HAS_STACK_PROTECTOR)
-      add_definitions(-fstack-protector)
+      add_compile_options(-fstack-protector)
     endif(HAS_STRONG_STACK_PROTECTOR)
-    add_definitions(-D_FORTIFY_SOURCE=2)
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
   endif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
 
-  if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-    if (WORD_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
-      add_definitions(
-        -msse2
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
+      add_compile_options(
         -mfpmath=sse
         -march=pentium4)
-    endif (WORD_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
+    endif (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
 
     if (HAS_DEBUG_OPTIMIZATION)
       set(CMAKE_CXX_FLAGS_DEBUG "-Og ${CMAKE_CXX_FLAGS_DEBUG}")
     else (HAS_DEBUG_OPTIMIZATION)
       set(CMAKE_CXX_FLAGS_DEBUG "-O0 -fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
     endif (HAS_DEBUG_OPTIMIZATION)
-    set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
-  elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-    if (WORD_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
-      add_definitions(-msse2 -march=pentium4)
-    endif (WORD_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
+    if (USE_ASAN OR USE_LEAKSAN OR USE_UBSAN OR USE_THDSAN)
+      if (HAS_DEBUG_OPTIMIZATION)
+        set(CMAKE_CXX_FLAGS_RELEASE "-Og ${CMAKE_CXX_FLAGS_RELEASE}")
+      else (HAS_DEBUG_OPTIMIZATION)
+        set(CMAKE_CXX_FLAGS_RELEASE "-O1 -fno-omit-frame-pointer ${CMAKE_CXX_FLAGS_RELEASE}")
+      endif (HAS_DEBUG_OPTIMIZATION)
+    else ()
+      set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
+    endif ()
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    if (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
+      add_compile_options(-msse2 -march=pentium4)
+    endif (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
 
     set(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CMAKE_CXX_FLAGS_DEBUG}")
     set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}")
-  elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
-    if (WORD_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
-      add_definitions(-march=pentium4)
-    endif (WORD_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+    if (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
+      add_compile_options(-march=pentium4)
+    endif (ADDRESS_SIZE EQUAL 32 AND NOT USESYSTEMLIBS)
 
     set(CMAKE_CXX_FLAGS_DEBUG "-O0 ${CMAKE_CXX_FLAGS_DEBUG}")
     set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
-  endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-  
-  if (NOT USESYSTEMLIBS AND CMAKE_SIZEOF_VOID_P EQUAL 4 OR CONSERVE_MEMORY)
-    # linking can be very memory-hungry, especially the final viewer link
-    set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory")
-  endif (NOT USESYSTEMLIBS AND CMAKE_SIZEOF_VOID_P EQUAL 4 OR CONSERVE_MEMORY)
-endif (LINUX)
+  endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 
+  # Enable these flags so we have a read only GOT and some linking opts
+  set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro -Wl,-z,now -Wl,--as-needed ${CMAKE_EXE_LINKER_FLAGS}")
+  set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,relro -Wl,-z,now -Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
+endif (LINUX)
 
 if (DARWIN)
-  add_definitions(-DLL_DARWIN=1)
-  set(CMAKE_CXX_LINK_FLAGS "-Wl,-no_compact_unwind -Wl,-headerpad_max_install_names,-search_paths_first")
+  add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION)
+  set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(DARWIN_extra_cstar_flags "-g")
+  set(DARWIN_extra_cstar_flags "-gdwarf-2 -fobjc-arc -fno-strict-aliasing -faligned-allocation")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${DARWIN_extra_cstar_flags}")
   # NOTE: it's critical that the optimization flag is put in front.
   # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}")
-  set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
-  set(ENABLE_SIGNING TRUE)
-  set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
+  if (USE_ASAN OR USE_LEAKSAN OR USE_UBSAN OR USE_THDSAN)
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O1 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O1 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+    set(CMAKE_CXX_FLAGS_RELEASE "-O1 -mavx -mprefer-vector-width=128 ${CMAKE_CXX_FLAGS_RELEASE}")
+    set(CMAKE_C_FLAGS_RELEASE "-O1 -mavx -mprefer-vector-width=128 ${CMAKE_C_FLAGS_RELEASE}")
+  else()
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+    set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_CXX_FLAGS_RELEASE}")
+    set(CMAKE_C_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_C_FLAGS_RELEASE}")
+  endif()
 endif (DARWIN)
 
 
@@ -208,47 +313,71 @@ if (LINUX OR DARWIN)
     set(UNIX_WARNINGS "-Werror")
   endif (NOT UNIX_DISABLE_FATAL_WARNINGS)
 
-  if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-    set(UNIX_WARNINGS "-Wall -Wno-sign-compare ${UNIX_WARNINGS} ")
-    set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder")
-  elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-    set(UNIX_WARNINGS "-Wall -Wno-sign-compare ${UNIX_WARNINGS} ")
-    set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder")
-  elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set(UNIX_WARNINGS "-Wall -Wno-unused-variable -Wno-maybe-uninitialized -Wno-sign-compare -Wno-attributes ${UNIX_WARNINGS}")
+    set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder -Wno-unused-local-typedefs")
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
+    set(UNIX_WARNINGS "-Wall ${UNIX_WARNINGS} ")
+    set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-unused-local-typedef -Wempty-body -Wunreachable-code -Wundefined-bool-conversion -Wenum-conversion -Wassign-enum -Wint-conversion -Wconstant-conversion -Wnewline-eof -Wno-protocol -Wno-tautological-type-limit-compare -Wno-unused-template -Wno-undef")
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     set(UNIX_WARNINGS "-w2 -diag-disable remark -wd68 -wd597 -wd780 -wd858 ${UNIX_WARNINGS} ")
     set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}")
-  endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+  endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${UNIX_WARNINGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${UNIX_CXX_WARNINGS}")
 
-  if (WORD_SIZE EQUAL 32)
+  if (ADDRESS_SIZE EQUAL 32)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-  elseif (WORD_SIZE EQUAL 64)
+  elseif (ADDRESS_SIZE EQUAL 64)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
-  endif (WORD_SIZE EQUAL 32)
+  endif (ADDRESS_SIZE EQUAL 32)
 endif (LINUX OR DARWIN)
 
-
 if (USESYSTEMLIBS)
   add_definitions(-DLL_USESYSTEMLIBS=1)
 
   if (LINUX AND ${ARCH} STREQUAL "i686")
-    add_definitions(-march=pentiumpro)
+    add_compile_options(-march=pentiumpro)
   endif (LINUX AND ${ARCH} STREQUAL "i686")
 
 else (USESYSTEMLIBS)
+  #Define this here so it propagates on all systems to all targets
+  #add_definitions(-DBOOST_THREAD_VERSION=4)
+
+  #Enforce compile-time correctness for fmt strings
+  add_definitions(-DFMT_STRING_ALIAS=1)
+
+  #Uncomment this definition when we can build cleanly against OpenSSL 1.1
+  add_definitions(-DOPENSSL_API_COMPAT=0x10100000L)
+
+  #Force glm ctor init
+  add_definitions(-DGLM_FORCE_CTOR_INIT=1)
+
+  if(USE_CRASHPAD)
+    add_definitions(-DUSE_CRASHPAD=1 -DCRASHPAD_URL="${CRASHPAD_URL}")
+  endif()
+
   set(${ARCH}_linux_INCLUDES
-      ELFIO
       atk-1.0
+      cairo
       gdk-pixbuf-2.0
       glib-2.0
       gstreamer-0.10
       gtk-2.0
       pango-1.0
+      pixman-1
       )
 endif (USESYSTEMLIBS)
 
+option(RELEASE_SHOW_ASSERTS "Enable asserts in release builds" OFF)
+
+if(RELEASE_SHOW_ASSERTS)
+  add_definitions(-DRELEASE_SHOW_ASSERT=1)
+else()
+  add_definitions(-URELEASE_SHOW_ASSERT)
+endif()
+
 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

indra/cmake/APR.cmake

@@ -12,42 +12,25 @@ if (USESYSTEMLIBS)
 else (USESYSTEMLIBS)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
-    if (LLCOMMON_LINK_SHARED)
-      set(APR_selector "lib")
-    else (LLCOMMON_LINK_SHARED)
-      set(APR_selector "")
-    endif (LLCOMMON_LINK_SHARED)
     set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apr-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apr-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
       )
     set(APRICONV_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apriconv-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/apriconv-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/apriconv-1.lib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/aprutil-1.lib ${APRICONV_LIBRARIES}
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib ${APRICONV_LIBRARIES}
       )
-    if(NOT LLCOMMON_LINK_SHARED)
-      list(APPEND APR_LIBRARIES Rpcrt4)
-    endif(NOT LLCOMMON_LINK_SHARED)
-  elseif (DARWIN)
-    if (LLCOMMON_LINK_SHARED)
-      set(APR_selector     "0.dylib")
-      set(APRUTIL_selector "0.dylib")
-    else (LLCOMMON_LINK_SHARED)
-      set(APR_selector     "a")
-      set(APRUTIL_selector "a")
-    endif (LLCOMMON_LINK_SHARED)
-    set(APR_LIBRARIES libapr-1.${APR_selector})
-    set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector})
-    set(APRICONV_LIBRARIES iconv)
-  else (WINDOWS)
+    list(APPEND APR_LIBRARIES Rpcrt4)
+  else ()
     set(APR_LIBRARIES apr-1)
     set(APRUTIL_LIBRARIES aprutil-1)
     set(APRICONV_LIBRARIES iconv)
-  endif (WINDOWS)
+  endif ()
+
   set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
 
   if (LINUX)

indra/cmake/Audio.cmake

@@ -13,25 +13,10 @@ else (USESYSTEMLIBS)
   set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
   set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
 
-  if (WINDOWS)
-    set(OGG_LIBRARIES
-        optimized ogg_static
-        debug ogg_static_d)
-    set(VORBIS_LIBRARIES
-        optimized vorbis_static
-        debug vorbis_static_d)
-    set(VORBISENC_LIBRARIES
-        optimized vorbisenc_static
-        debug vorbisenc_static_d)
-    set(VORBISFILE_LIBRARIES
-        optimized vorbisfile_static
-        debug vorbisfile_static_d)
-  else (WINDOWS)
-    set(OGG_LIBRARIES ogg)
-    set(VORBIS_LIBRARIES vorbis)
-    set(VORBISENC_LIBRARIES vorbisenc)
-    set(VORBISFILE_LIBRARIES vorbisfile)
-  endif (WINDOWS)
+  set(OGG_LIBRARIES ogg)
+  set(VORBIS_LIBRARIES vorbis)
+  set(VORBISENC_LIBRARIES vorbisenc)
+  set(VORBISFILE_LIBRARIES vorbisfile)
 endif (USESYSTEMLIBS)
 
 link_directories(

indra/cmake/Boost.cmake

@@ -7,87 +7,80 @@ set(Boost_FIND_REQUIRED ON)
 if (USESYSTEMLIBS)
   include(FindBoost)
 
+  set(BOOST_CHRONO_LIBRARY boost_chrono-mt)
   set(BOOST_CONTEXT_LIBRARY boost_context-mt)
   set(BOOST_COROUTINE_LIBRARY boost_coroutine-mt)
+  set(BOOST_DATE_TIME_LIBRARY boost_date_time-mt)
   set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
+  set(BOOST_IOSTREAMS_LIBRARY boost_iostreams-mt)
   set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
   set(BOOST_REGEX_LIBRARY boost_regex-mt)
   set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
   set(BOOST_SYSTEM_LIBRARY boost_system-mt)
   set(BOOST_THREAD_LIBRARY boost_thread-mt)
-  set(BOOST_IOSTREAMS_LIBRARY boost_iostreams-mt)
 else (USESYSTEMLIBS)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-  set(BOOST_VERSION "1.57")
+  set(BOOST_VERSION "1.69")
 
   if (WINDOWS)
-    if(MSVC80)
-      # This should be obsolete at this point
-      set(BOOST_CONTEXT_LIBRARY 
-          optimized libboost_context-vc80-mt-${BOOST_VERSION}
-          debug libboost_context-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_FILESYSTEM_LIBRARY 
-          optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
-          debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
-          debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc80-mt-${BOOST_VERSION}
-          debug libboost_regex-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc80-mt-${BOOST_VERSION}
-          debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_SYSTEM_LIBRARY 
-          optimized libboost_system-vc80-mt-${BOOST_VERSION}
-          debug libboost_system-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_THREAD_LIBRARY 
-          optimized libboost_thread-vc80-mt-${BOOST_VERSION}
-          debug libboost_thread-vc80-mt-gd-${BOOST_VERSION})
-      set(BOOST_IOSTREAMS_LIBRARY
-          optimized libboost_iostreams-vc80-mt-${BOOST_VERSION}
-          debug libboost_iostreams-vc80-mt-gd-${BOOST_VERSION})
-    else(MSVC80)
-      # MSVC 10.0 config
-      set(BOOST_CONTEXT_LIBRARY 
-          optimized libboost_context-mt
-          debug libboost_context-mt-gd)
-      set(BOOST_COROUTINE_LIBRARY 
-          optimized libboost_coroutine-mt
-          debug libboost_coroutine-mt-gd)
-      set(BOOST_FILESYSTEM_LIBRARY 
-          optimized libboost_filesystem-mt
-          debug libboost_filesystem-mt-gd)
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-mt
-          debug libboost_program_options-mt-gd)
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-mt
-          debug libboost_regex-mt-gd)
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-mt
-          debug libboost_signals-mt-gd)
-      set(BOOST_SYSTEM_LIBRARY 
-          optimized libboost_system-mt
-          debug libboost_system-mt-gd)
-      set(BOOST_THREAD_LIBRARY 
-          optimized libboost_thread-mt
-          debug libboost_thread-mt-gd)
-      set(BOOST_IOSTREAMS_LIBRARY
-          optimized libboost_iostreams-mt
-          debug libboost_iostreams-mt-gd)
-    endif (MSVC80)
+    if (ADDRESS_SIZE EQUAL 64)
+      set(BOOST_LIB_POSTFIX "-x64")
+    else()
+      set(BOOST_LIB_POSTFIX "-x32")
+    endif()
+    set(BOOST_CHRONO_LIBRARY
+        optimized libboost_chrono-mt${BOOST_LIB_POSTFIX}
+        debug libboost_chrono-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_CONTEXT_LIBRARY
+        optimized libboost_context-mt${BOOST_LIB_POSTFIX}
+        debug libboost_context-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_COROUTINE_LIBRARY
+        optimized libboost_coroutine-mt${BOOST_LIB_POSTFIX}
+        debug libboost_coroutine-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_DATE_TIME_LIBRARY
+        optimized libboost_date_time-mt${BOOST_LIB_POSTFIX}
+        debug libboost_date_time-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_FILESYSTEM_LIBRARY
+        optimized libboost_filesystem-mt${BOOST_LIB_POSTFIX}
+        debug libboost_filesystem-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_IOSTREAMS_LIBRARY
+        optimized libboost_iostreams-mt${BOOST_LIB_POSTFIX}
+        debug libboost_iostreams-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY
+        optimized libboost_program_options-mt${BOOST_LIB_POSTFIX}
+        debug libboost_program_options-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_REGEX_LIBRARY
+        optimized libboost_regex-mt${BOOST_LIB_POSTFIX}
+        debug libboost_regex-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_SIGNALS_LIBRARY
+        optimized libboost_signals-mt${BOOST_LIB_POSTFIX}
+        debug libboost_signals-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_SYSTEM_LIBRARY
+        optimized libboost_system-mt${BOOST_LIB_POSTFIX}
+        debug libboost_system-mt-gd${BOOST_LIB_POSTFIX})
+    set(BOOST_THREAD_LIBRARY
+        optimized libboost_thread-mt${BOOST_LIB_POSTFIX}
+        debug libboost_thread-mt-gd${BOOST_LIB_POSTFIX})
   elseif (LINUX)
+    set(BOOST_CHRONO_LIBRARY
+        optimized boost_chrono-mt
+        debug boost_chrono-mt-d)
     set(BOOST_CONTEXT_LIBRARY
         optimized boost_context-mt
         debug boost_context-mt-d)
     set(BOOST_COROUTINE_LIBRARY
         optimized boost_coroutine-mt
         debug boost_coroutine-mt-d)
+    set(BOOST_DATE_TIME_LIBRARY
+        optimized boost_date_time-mt
+        debug boost_date_time-mt-d)
     set(BOOST_FILESYSTEM_LIBRARY
         optimized boost_filesystem-mt
         debug boost_filesystem-mt-d)
+    set(BOOST_IOSTREAMS_LIBRARY
+        optimized boost_iostreams-mt
+        debug boost_iostreams-mt-d)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY
         optimized boost_program_options-mt
         debug boost_program_options-mt-d)
@@ -103,36 +96,45 @@ else (USESYSTEMLIBS)
     set(BOOST_THREAD_LIBRARY
         optimized boost_thread-mt
         debug boost_thread-mt-d)
-    set(BOOST_IOSTREAMS_LIBRARY
-        optimized boost_iostreams-mt
-        debug boost_iostreams-mt-d)
   elseif (DARWIN)
+    set(BOOST_CHRONO_LIBRARY
+        optimized boost_chrono-mt-x64
+        debug boost_chrono-mt-x64-d)
     set(BOOST_CONTEXT_LIBRARY
-        optimized boost_context-mt
-        debug boost_context-mt-d)
+        optimized boost_context-mt-x64
+        debug boost_context-mt-x64-d)
     set(BOOST_COROUTINE_LIBRARY
-        optimized boost_coroutine-mt
-        debug boost_coroutine-mt-d)
+        optimized boost_coroutine-mt-x64
+        debug boost_coroutine-mt-x64-d)
+    set(BOOST_DATE_TIME_LIBRARY
+        optimized boost_date_time-mt-x64
+        debug boost_date_time-mt-x64-d)
     set(BOOST_FILESYSTEM_LIBRARY
-        optimized boost_filesystem-mt
-        debug boost_filesystem-mt-d)
+        optimized boost_filesystem-mt-x64
+        debug boost_filesystem-mt-x64-d)
+    set(BOOST_IOSTREAMS_LIBRARY
+        optimized boost_iostreams-mt-x64
+        debug boost_iostreams-mt-x64-d)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY
-        optimized boost_program_options-mt
-        debug boost_program_options-mt-d)
+        optimized boost_program_options-mt-x64
+        debug boost_program_options-mt-x64-d)
     set(BOOST_REGEX_LIBRARY
-        optimized boost_regex-mt
-        debug boost_regex-mt-d)
+        optimized boost_regex-mt-x64
+        debug boost_regex-mt-x64-d)
     set(BOOST_SIGNALS_LIBRARY
-        optimized boost_signals-mt
-        debug boost_signals-mt-d)
+        optimized boost_signals-mt-x64
+        debug boost_signals-mt-x64-d)
     set(BOOST_SYSTEM_LIBRARY
-        optimized boost_system-mt
-        debug boost_system-mt-d)
+        optimized boost_system-mt-x64
+        debug boost_system-mt-x64-d)
     set(BOOST_THREAD_LIBRARY
-        optimized boost_thread-mt
-        debug boost_thread-mt-d)
-    set(BOOST_IOSTREAMS_LIBRARY
-        optimized boost_iostreams-mt
-        debug boost_iostreams-mt-d)
-  endif (WINDOWS)
+        optimized boost_thread-mt-x64
+        debug boost_thread-mt-x64-d)
+  endif ()
 endif (USESYSTEMLIBS)
+
+if (LINUX)
+    set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt)
+    set(BOOST_THREAD_LIBRARY ${BOOST_THREAD_LIBRARY} rt)
+endif (LINUX)
+

indra/cmake/BuildPackagesInfo.cmake

 # -*- cmake -*-
 # Construct the version and copyright information based on package data.
 include(Python)
-include(Variables)
+include(FindAutobuild)
 
+# packages-formatter.py runs autobuild install --versions, which needs to know
+# the build_directory, which (on Windows) depends on AUTOBUILD_ADDRSIZE.
+# Within an autobuild build, AUTOBUILD_ADDRSIZE is already set. But when
+# building in an IDE, it probably isn't. Set it explicitly using
+# run_build_test.py.
 add_custom_command(OUTPUT packages-info.txt
   COMMENT "Generating packages-info.txt for the about box"
   MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/../autobuild.xml
   DEPENDS ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py
-  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py -p=${AUTOBUILD_PLATFORM_NAME} > packages-info.txt
+          ${CMAKE_SOURCE_DIR}/../autobuild.xml
+  COMMAND ${Python3_EXECUTABLE}
+          ${CMAKE_SOURCE_DIR}/cmake/run_build_test.py -DAUTOBUILD_ADDRSIZE=${ADDRESS_SIZE} -DAUTOBUILD=${AUTOBUILD_EXECUTABLE}
+          ${Python3_EXECUTABLE}
+          ${CMAKE_SOURCE_DIR}/../scripts/packages-formatter.py "${VIEWER_CHANNEL}" "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}" > packages-info.txt
   )

indra/cmake/BuildVersion.cmake

 # -*- cmake -*-
 # Construct the viewer version number based on the indra/VIEWER_VERSION file
 
+option(REVISION_FROM_VCS "Get current revision from vcs" ON)
+
+find_package(Git)
+
 if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/newview/
     set(VIEWER_VERSION_BASE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/newview/VIEWER_VERSION.txt")
 
@@ -10,54 +14,71 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
         string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" VIEWER_VERSION_MINOR ${VIEWER_SHORT_VERSION})
         string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" VIEWER_VERSION_PATCH ${VIEWER_SHORT_VERSION})
 
-        if (DEFINED ENV{revision})
+        if ((NOT REVISION_FROM_VCS) AND DEFINED ENV{revision})
            set(VIEWER_VERSION_REVISION $ENV{revision})
-           message("Revision (from environment): ${VIEWER_VERSION_REVISION}")
-
-        else (DEFINED ENV{revision})
-          find_program(MERCURIAL
-                       NAMES hg
-                       PATHS [HKEY_LOCAL_MACHINE\\Software\\TortoiseHG]
-                       PATH_SUFFIXES Mercurial)
-          mark_as_advanced(MERCURIAL)
-          if (MERCURIAL)
-            execute_process(COMMAND ${MERCURIAL} identify -n
-                            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                            RESULT_VARIABLE hg_id_result
-                            ERROR_VARIABLE hg_id_error
-                            OUTPUT_VARIABLE VIEWER_VERSION_REVISION
-                            OUTPUT_STRIP_TRAILING_WHITESPACE)
-            if (NOT ${hg_id_result} EQUAL 0)
-              message(SEND_ERROR "Revision number generation failed with output:\n${hg_id_error}")
-            else (NOT ${hg_id_result} EQUAL 0)
-              string(REGEX REPLACE "[^0-9a-f]" "" VIEWER_VERSION_REVISION ${VIEWER_VERSION_REVISION})
-            endif (NOT ${hg_id_result} EQUAL 0)
-            if ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
-              message("Revision (from hg) ${VIEWER_VERSION_REVISION}")
-            else ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
-              message("Revision not set (repository not found?); using 0")
-              set(VIEWER_VERSION_REVISION 0 )
-            endif ("${VIEWER_VERSION_REVISION}" MATCHES "^[0-9]+$")
-           else (MERCURIAL)
-              message("Revision not set: mercurial not found; using 0")
+           message(STATUS "Revision (from environment): ${VIEWER_VERSION_REVISION}")
+        elseif ((NOT REVISION_FROM_VCS) AND DEFINED ENV{AUTOBUILD_BUILD_ID})
+           set(VIEWER_VERSION_REVISION $ENV{AUTOBUILD_BUILD_ID})
+           message(STATUS "Revision (from autobuild environment): ${VIEWER_VERSION_REVISION}")
+        elseif (Git_FOUND)
+          execute_process(
+                       COMMAND ${GIT_EXECUTABLE} rev-list HEAD --count
+                       OUTPUT_VARIABLE GIT_REV_LIST_COUNT
+                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                       OUTPUT_STRIP_TRAILING_WHITESPACE
+                       )
+
+            if(GIT_REV_LIST_COUNT)
+              set(VIEWER_VERSION_REVISION ${GIT_REV_LIST_COUNT})
+            else(GIT_REV_LIST_COUNT)
               set(VIEWER_VERSION_REVISION 0)
-           endif (MERCURIAL)
-        endif (DEFINED ENV{revision})
+            endif(GIT_REV_LIST_COUNT)
+        else ()
+          set(VIEWER_VERSION_REVISION 0)
+        endif ()
         message("Building '${VIEWER_CHANNEL}' Version ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
     else ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
         message(SEND_ERROR "Cannot get viewer version from '${VIEWER_VERSION_BASE_FILE}'") 
     endif ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
 
     if ("${VIEWER_VERSION_REVISION}" STREQUAL "")
-      message("Ultimate fallback, revision was blank or not set: will use 0")
+      message(STATUS "Ultimate fallback, revision was blank or not set: will use 0")
       set(VIEWER_VERSION_REVISION 0)
     endif ("${VIEWER_VERSION_REVISION}" STREQUAL "")
-
-    set(VIEWER_CHANNEL_VERSION_DEFINES
-        "LL_VIEWER_CHANNEL=\"${VIEWER_CHANNEL}\""
-        "LL_VIEWER_VERSION_MAJOR=${VIEWER_VERSION_MAJOR}"
-        "LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}"
-        "LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}"
-        "LL_VIEWER_VERSION_BUILD=${VIEWER_VERSION_REVISION}"
-        )
 endif (NOT DEFINED VIEWER_SHORT_VERSION)
+
+if (NOT DEFINED VIEWER_COMMIT_LONG_SHA)
+  if(Git_FOUND)
+    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+                    OUTPUT_VARIABLE GIT_COMMIT_SHA
+                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+                    )
+
+    if(GIT_COMMIT_SHA)
+      set(VIEWER_COMMIT_LONG_SHA ${GIT_COMMIT_SHA})
+    else()
+      set(VIEWER_COMMIT_LONG_SHA 0)
+    endif()
+  else()
+    set(VIEWER_COMMIT_LONG_SHA 0)
+  endif()
+endif (NOT DEFINED VIEWER_COMMIT_LONG_SHA)
+
+if (NOT DEFINED VIEWER_COMMIT_SHORT_SHA)
+  if(Git_FOUND)
+    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+                    OUTPUT_VARIABLE GIT_COMMIT_SHORT_SHA
+                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+                    )
+
+    if(GIT_COMMIT_SHORT_SHA)
+      set(VIEWER_COMMIT_SHORT_SHA ${GIT_COMMIT_SHORT_SHA})
+    else()
+      set(VIEWER_COMMIT_SHORT_SHA 0)
+    endif()
+  else()
+    set(VIEWER_COMMIT_SHORT_SHA 0)
+  endif()
+endif (NOT DEFINED VIEWER_COMMIT_SHORT_SHA)

indra/cmake/CARes.cmake

-# -*- cmake -*-
-include(Linking)
-include(Prebuilt)
-
-set(CARES_FIND_QUIETLY ON)
-set(CARES_FIND_REQUIRED ON)
-
-if (USESYSTEMLIBS)
-  include(FindCARes)
-else (USESYSTEMLIBS)
-    use_prebuilt_binary(ares)
-    add_definitions("-DCARES_STATICLIB")
-    if (WINDOWS)
-        set(CARES_LIBRARIES areslib)
-    elseif (DARWIN)
-       set(CARES_LIBRARIES cares)
-    else (WINDOWS)
-        set(CARES_LIBRARIES cares)
-    endif (WINDOWS)
-    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
-endif (USESYSTEMLIBS)

indra/cmake/CEFPlugin.cmake

+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+
+if (USESYSTEMLIBS)
+    set(CEFPLUGIN OFF CACHE BOOL
+        "CEFPLUGIN support for the llplugin/llmedia test apps.")
+else (USESYSTEMLIBS)
+    use_prebuilt_binary(dullahan)
+    set(CEFPLUGIN ON CACHE BOOL
+        "CEFPLUGIN support for the llplugin/llmedia test apps.")
+        set(CEF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/cef)
+endif (USESYSTEMLIBS)
+
+if (WINDOWS)
+    set(CEF_PLUGIN_LIBRARIES
+        libcef.lib
+        libcef_dll_wrapper.lib
+        dullahan.lib
+    )
+elseif (DARWIN)
+    FIND_LIBRARY(APPKIT_LIBRARY AppKit)
+    if (NOT APPKIT_LIBRARY)
+        message(FATAL_ERROR "AppKit not found")
+    endif()
+
+    FIND_LIBRARY(CEF_LIBRARY "Chromium Embedded Framework" ${ARCH_PREBUILT_DIRS_RELEASE})
+    if (NOT CEF_LIBRARY)
+        message(FATAL_ERROR "CEF not found")
+    endif()
+
+    set(CEF_PLUGIN_LIBRARIES
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libcef_dll_wrapper.a
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libdullahan.a
+        ${APPKIT_LIBRARY}
+        ${CEF_LIBRARY}
+       )
+
+elseif (LINUX)
+    set(CEF_PLUGIN_LIBRARIES
+       dullahan
+       cef_dll_wrapper
+       cef
+    )
+endif (WINDOWS)

indra/cmake/CMakeLists.txt

@@ -2,8 +2,6 @@
 
 include(00-Common)
 
-project(cmake)
-
 set(cmake_SOURCE_FILES
     CMakeLists.txt
 
@@ -11,55 +9,45 @@ set(cmake_SOURCE_FILES
     APR.cmake
     Audio.cmake
     Boost.cmake
+    BuildPackagesInfo.cmake
     BuildVersion.cmake
-    CARes.cmake
+    CEFPlugin.cmake
     CMakeCopyIfDifferent.cmake
     ConfigurePkgConfig.cmake
     CURL.cmake
     Copy3rdPartyLibs.cmake
+    CrashPad.cmake
+    CXXFeatureDetection.cmake
     DBusGlib.cmake
     DeploySharedLibs.cmake
     DragDrop.cmake
     EXPAT.cmake
-    ExamplePlugin.cmake
     FindAPR.cmake
     FindAutobuild.cmake
-    FindCARes.cmake
-    FindCXX14Features.cmake
-    FindCXXThreadLocal.cmake
-    FindFMODEX.cmake
-    FindGLH.cmake
-    FindGoogleBreakpad.cmake
     FindGooglePerfTools.cmake
     FindHUNSPELL.cmake
-    FindJsonCpp.cmake
     FindNDOF.cmake
     FindOpenJPEG.cmake
     FindURIPARSER.cmake
     FindXmlRpcEpi.cmake
     FindZLIB.cmake
-    FMODEX.cmake
+    FMODSTUDIO.cmake
     FreeType.cmake
-    GLEXT.cmake
-    GLH.cmake
+    GeneratePrecompiledHeader.cmake
+    GLM.cmake
     GLOD.cmake
     GLEW.cmake
     GStreamer010Plugin.cmake
-    Glui.cmake
-    Glut.cmake
-    GoogleBreakpad.cmake
     GooglePerfTools.cmake
     Havok.cmake
     Hunspell.cmake
     JPEG.cmake
-    JsonCpp.cmake
     LLAddBuildTest.cmake
     LLAppearance.cmake
-    LLAppearanceUtility.cmake
     LLAudio.cmake
     LLCharacter.cmake
     LLCommon.cmake
-    LLCrashLogger.cmake
+    LLDarwin.cmake
     LLImage.cmake
     LLImageJ2COJ.cmake
     LLInventory.cmake
@@ -90,7 +78,6 @@ set(cmake_SOURCE_FILES
     Prebuilt.cmake
     PulseAudio.cmake
     Python.cmake
-    QuickTimePlugin.cmake
     TemplateCheck.cmake
     Tut.cmake
     UI.cmake
@@ -99,7 +86,7 @@ set(cmake_SOURCE_FILES
     Variables.cmake
     ViewerMiscLibs.cmake
     VisualLeakDetector.cmake
-    WebKitLibPlugin.cmake
+    LibVLCPlugin.cmake
     XmlRpcEpi.cmake
     ZLIB.cmake
     )

indra/cmake/CURL.cmake

@@ -10,14 +10,12 @@ else (USESYSTEMLIBS)
   use_prebuilt_binary(curl)
   if (WINDOWS)
     set(CURL_LIBRARIES 
-    debug libcurld.lib
-    optimized libcurl.lib)
+    debug libcurl_a_debug.lib Normaliz.lib
+    optimized libcurl_a.lib Normaliz.lib)
   elseif (LINUX)
-    use_prebuilt_binary(libidn)
-    set(CURL_LIBRARIES curl idn)
+    set(CURL_LIBRARIES curl)
   else (DARWIN)
-    use_prebuilt_binary(libidn)
-    set(CURL_LIBRARIES curl idn iconv)
+    set(CURL_LIBRARIES curl iconv)
   endif ()
   set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (USESYSTEMLIBS)

indra/cmake/CXXFeatureDetection.cmake

+# -*- cmake -*-
+#
+# Module that checks for C++ features
+#
+
+include(WriteCompilerDetectionHeader)
+
+write_compiler_detection_header(
+  FILE "${CMAKE_CURRENT_BINARY_DIR}/generated/llcompilerfeatures.h"
+  PREFIX LL
+  COMPILERS AppleClang Clang GNU MSVC Intel
+  FEATURES
+  cxx_alignas cxx_alignof cxx_attribute_deprecated cxx_decltype cxx_decltype_auto cxx_nullptr cxx_override cxx_thread_local cxx_range_for cxx_static_assert
+)

indra/cmake/ConfigurePkgConfig.cmake

@@ -6,17 +6,17 @@ SET(DEBUG_PKG_CONFIG "YES")
 IF("$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "")
 
   # Guess at architecture-specific system library paths.
-  if (WORD_SIZE EQUAL 32)
+  if (ADDRESS_SIZE EQUAL 32)
     SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib32 /usr/lib)
     SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib32 /usr/local/lib)
     SET(PKG_CONFIG_MULTI_GUESS /usr/lib/i386-linux-gnu)
     SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/i386-linux-gnu)
-  else (WORD_SIZE EQUAL 32)
+  else (ADDRESS_SIZE EQUAL 32)
     SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib64 /usr/lib)
     SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib64 /usr/local/lib)
     SET(PKG_CONFIG_MULTI_GUESS /usr/lib/x86_64-linux-gnu)
     SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/x86_64-linux-gnu)
-  endif (WORD_SIZE EQUAL 32)
+  endif (ADDRESS_SIZE EQUAL 32)
   
   # Use DPKG architecture, if available.
   IF (${DPKG_ARCH})

indra/cmake/Copy3rdPartyLibs.cmake

@@ -7,6 +7,7 @@
 include(CMakeCopyIfDifferent)
 include(Linking)
 include(Variables)
+include(LLCommon)
 
 ###################################################################
 # set up platform specific lists of files that need to be copied
@@ -18,171 +19,89 @@ if(WINDOWS)
 
     #*******************************
     # VIVOX - *NOTE: no debug version
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
-        SLVoice.exe
-        ca-bundle.crt
-        libsndfile-1.dll
-        vivoxplatform.dll
-        vivoxsdk.dll
-        ortp.dll
-        zlib1.dll
-        vivoxoal.dll
-        )
+    set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(slvoice_src_dir "${ARCH_PREBUILT_BIN_RELEASE}")    
+    set(slvoice_files SLVoice.exe )
+    if (ADDRESS_SIZE EQUAL 64)
+        list(APPEND vivox_libs
+            vivoxsdk_x64.dll
+            ortp_x64.dll
+            )
+    else (ADDRESS_SIZE EQUAL 64)
+        list(APPEND vivox_libs
+            vivoxsdk.dll
+            ortp.dll
+            )
+    endif (ADDRESS_SIZE EQUAL 64)
 
     #*******************************
     # Misc shared libs 
 
     set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
     set(debug_files
-        openjpegd.dll
-        libapr-1.dll
-        libaprutil-1.dll
-        libapriconv-1.dll
-        ssleay32.dll
-        libeay32.dll
-        glod.dll    
-        libhunspell.dll
+        openjpeg.dll
         )
 
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
         openjpeg.dll
-        libapr-1.dll
-        libaprutil-1.dll
-        libapriconv-1.dll
-        ssleay32.dll
-        libeay32.dll
+        openjpeg.pdb
+        nghttp2.dll
         glod.dll
-        libhunspell.dll
         )
 
+    if(ADDRESS_SIZE EQUAL 64)
+      list(APPEND debug_files
+           libcrypto-1_1-x64.dll
+           libcrypto-1_1-x64.pdb
+           libssl-1_1-x64.dll
+           libssl-1_1-x64.pdb
+           )
+      list(APPEND release_files
+           libcrypto-1_1-x64.dll
+           libcrypto-1_1-x64.pdb
+           libssl-1_1-x64.dll
+           libssl-1_1-x64.pdb
+           )
+    else(ADDRESS_SIZE EQUAL 64)
+      list(APPEND debug_files
+           libcrypto-1_1.dll
+           libcrypto-1_1.pdb
+           libssl-1_1.dll
+           libssl-1_1.pdb
+           )
+      list(APPEND release_files
+           libcrypto-1_1.dll
+           libcrypto-1_1.pdb
+           libssl-1_1.dll
+           libssl-1_1.pdb
+           )
+    endif(ADDRESS_SIZE EQUAL 64)
+
     if(USE_TCMALLOC)
       list(APPEND debug_files libtcmalloc_minimal-debug.dll)
       list(APPEND release_files libtcmalloc_minimal.dll)
     endif(USE_TCMALLOC)
 
-    if(USE_TBBMALLOC)
-      list(APPEND debug_files tbbmalloc_debug.dll tbbmalloc_proxy_debug.dll)
-      list(APPEND release_files tbbmalloc.dll tbbmalloc_proxy.dll)
-    endif(USE_TBBMALLOC)
-
-    if(OPENAL)
+    if(USE_OPENAL)
       list(APPEND debug_files alut.dll OpenAL32.dll)
       list(APPEND release_files alut.dll OpenAL32.dll)
-    endif(OPENAL)
-
-    if (FMODSTUDIO)
-      if(WORD_SIZE STREQUAL 64)
-        list(APPEND debug_files fmodL64.dll)
-        list(APPEND release_files fmod64.dll)
-      else(WORD_SIZE STREQUAL 64)
-        list(APPEND debug_files fmodL.dll)
-        list(APPEND release_files fmod.dll)
-      endif(WORD_SIZE STREQUAL 64)
-    endif (FMODSTUDIO)
-
-    if (FMODEX)
-      if(WORD_SIZE STREQUAL 64)
-        list(APPEND debug_files fmodexL64.dll)
-        list(APPEND release_files fmodex64.dll)
-      else(WORD_SIZE STREQUAL 64)
-        list(APPEND debug_files fmodexL.dll)
-        list(APPEND release_files fmodex.dll)
-      endif(WORD_SIZE STREQUAL 64)
-    endif (FMODEX)
-
-    #*******************************
-    # Copy MS C runtime dlls, required for packaging.
-    # *TODO - Adapt this to support VC9
-    if (MSVC12) # VisualStudio 2013, which is (sigh) VS 12
-        set(MSVC_VER 120)
-        set(MSVC_VERDOT 12.0)
-    else (MSVC14)
-        set(MSVC_VER 140)
-        set(MSVC_VERDOT 14.0)
-    else (MSVC12)
-        MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake")
-    endif (MSVC12)
-	if (WORD_SIZE EQUAL 32)
-      set (CRT_ARCHITECTURE x86)
-    elseif (WORD_SIZE EQUAL 64)
-      set (CRT_ARCHITECTURE x64)
-    endif (WORD_SIZE EQUAL 32)
-
-    FIND_PATH(debug_msvc_redist_path msvcr${MSVC_VER}d.dll
-        PATHS
-        ${MSVC_DEBUG_REDIST_PATH}
-        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;${MSVC_VERDOT}]/VC/redist/Debug_NonRedist/${CRT_ARCHITECTURE}/Microsoft.VC${MSVC_VER}.DebugCRT
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
-        NO_DEFAULT_PATH
-        )
-
-	mark_as_advanced(debug_msvc_redist_path)
-    if(EXISTS ${debug_msvc_redist_path})
-        set(debug_msvc_files
-            msvcr${MSVC_VER}d.dll
-            msvcp${MSVC_VER}d.dll
-            )
-
-        copy_if_different(
-            ${debug_msvc_redist_path}
-            "${SHARED_LIB_STAGING_DIR_DEBUG}"
-            out_targets
-            ${debug_msvc_files}
-            )
-        set(third_party_targets ${third_party_targets} ${out_targets})
-
-    endif ()
-
-    FIND_PATH(release_msvc_redist_path msvcr${MSVC_VER}.dll
-        PATHS
-        ${MSVC_REDIST_PATH}
-        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;${MSVC_VERDOT}]/VC/redist/${CRT_ARCHITECTURE}/Microsoft.VC${MSVC_VER}.CRT
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
-        NO_DEFAULT_PATH
-        )
+    endif(USE_OPENAL)
 
-    mark_as_advanced(release_msvc_redist_path)
-    if(EXISTS ${release_msvc_redist_path})
-        set(release_msvc_files
-            msvcr${MSVC_VER}.dll
-            msvcp${MSVC_VER}.dll
-            )
-
-        copy_if_different(
-            ${release_msvc_redist_path}
-            "${SHARED_LIB_STAGING_DIR_RELEASE}"
-            out_targets
-            ${release_msvc_files}
-            )
-        set(third_party_targets ${third_party_targets} ${out_targets})
-
-        copy_if_different(
-            ${release_msvc_redist_path}
-            "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
-            out_targets
-            ${release_msvc_files}
-            )
-        set(third_party_targets ${third_party_targets} ${out_targets})
-          
-    endif ()
+    if (USE_FMODSTUDIO)
+      list(APPEND debug_files fmodL.dll)
+      list(APPEND release_files fmod.dll)
+    endif (USE_FMODSTUDIO)
 
 elseif(DARWIN)
     set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
 
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
-        SLVoice
-        ca-bundle.crt
-        libsndfile.dylib
-        libvivoxoal.dylib
+    set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(slvoice_files SLVoice)
+    set(vivox_libs
         libortp.dylib
-        libvivoxplatform.dylib
         libvivoxsdk.dylib
        )
     set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
@@ -190,24 +109,18 @@ elseif(DARWIN)
        )
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
-        libapr-1.0.dylib
-        libapr-1.dylib
-        libaprutil-1.0.dylib
-        libaprutil-1.dylib
-        libexception_handler.dylib
-        libfreetype.6.dylib
         libGLOD.dylib
-        libndofdev.dylib
+        libopenjpeg.dylib
        )
 
-    if (OPENAL)
+    if (USE_OPENAL)
       list(APPEND release_files libopenal.dylib libalut.dylib)
-    endif (OPENAL)
+    endif (USE_OPENAL)
 
-    if (FMODEX)
-      list(APPEND debug_files libfmodexL.dylib)
-      list(APPEND release_files libfmodex.dylib)
-    endif (FMODEX)
+    if (USE_FMODSTUDIO)
+      list(APPEND debug_files libfmodL.dylib)
+      list(APPEND release_files libfmod.dylib)
+    endif (USE_FMODSTUDIO)
 
 elseif(LINUX)
     # linux is weird, multiple side by side configurations aren't supported
@@ -216,16 +129,15 @@ elseif(LINUX)
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
     set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
 
-    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    set(vivox_files
+    set(vivox_lib_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(vivox_libs
         libsndfile.so.1
         libortp.so
         libvivoxoal.so.1
-        libvivoxplatform.so
         libvivoxsdk.so
-        SLVoice
-        # ca-bundle.crt   #No cert for linux.  It is actually still 3.2SDK.
-       )
+        )
+    set(slvoice_files SLVoice)
+
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
     # or ARCH_PREBUILT_DIRS
     set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
@@ -241,7 +153,7 @@ elseif(LINUX)
         libatk-1.0.so
         libexpat.so
         libexpat.so.1
-        libfreetype.so.6.12.0
+        libfreetype.so.6.14.0
         libfreetype.so.6
         libfreetype.so
         libGLOD.so
@@ -249,7 +161,7 @@ elseif(LINUX)
         libgobject-2.0.so
         libopenal.so
         libopenjpeg.so
-        libfontconfig.so.1.8.0
+        libfontconfig.so.1.9.2
         libfontconfig.so.1
         libfontconfig.so
        )
@@ -258,20 +170,15 @@ elseif(LINUX)
       list(APPEND release_files "libtcmalloc_minimal.so")
     endif (USE_TCMALLOC)
 
-    if (FMODEX)
-      list(APPEND debug_files "libfmodexL.so")
-      list(APPEND release_files "libfmodex.so")
-    endif (FMODEX)
-
-    if (FMODSTUDIO)
+    if (USE_FMODSTUDIO)
       list(APPEND debug_files "libfmodL.so")
       list(APPEND release_files "libfmod.so")
-    endif (FMODSTUDIO)
+    endif (USE_FMODSTUDIO)
 
 else(WINDOWS)
     message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
-    set(vivox_files "")
+    set(vivox_lib_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
+    set(vivox_libs "")
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
     # or ARCH_PREBUILT_DIRS
     set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib/debug")
@@ -294,31 +201,36 @@ endif(WINDOWS)
 ################################################################
 
 copy_if_different(
-    ${vivox_src_dir}
+    ${vivox_lib_dir}
     "${SHARED_LIB_STAGING_DIR_DEBUG}"
     out_targets 
-    ${vivox_files}
+    ${vivox_libs}
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
 copy_if_different(
-    ${vivox_src_dir}
+    ${slvoice_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELEASE}"
+    out_targets
+    ${slvoice_files}
+    )
+copy_if_different(
+    ${vivox_lib_dir}
     "${SHARED_LIB_STAGING_DIR_RELEASE}"
     out_targets
-    ${vivox_files}
+    ${vivox_libs}
     )
+
 set(third_party_targets ${third_party_targets} ${out_targets})
 
 copy_if_different(
-    ${vivox_src_dir}
+    ${vivox_lib_dir}
     "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
     out_targets
-    ${vivox_files}
+    ${vivox_libs}
     )
 set(third_party_targets ${third_party_targets} ${out_targets})
 
-
-
 copy_if_different(
     ${debug_src_dir}
     "${SHARED_LIB_STAGING_DIR_DEBUG}"

indra/cmake/CrashPad.cmake

+# -*- cmake -*-
+include(Prebuilt)
+include(Variables)
+
+if(USE_CRASHPAD)
+
+if (USESYSTEMLIBS)
+else (USESYSTEMLIBS)
+  use_prebuilt_binary(crashpad)
+  if (WINDOWS)
+    set(CRASHPAD_LIBRARIES 
+    debug client.lib util.lib base.lib
+    optimized client.lib util.lib base.lib)
+  elseif (LINUX)
+
+  else (DARWIN)
+
+  endif ()
+  set(CRASHPAD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/crashpad)
+endif (USESYSTEMLIBS)
+
+endif()

indra/cmake/DeploySharedLibs.cmake

@@ -6,19 +6,18 @@
 # BIN_NAME= The full path the the binary to search for dependecies.
 # SEARCH_DIRS= The full paths to dirs to search for dependencies.
 # DST_PATH= The full path where the dependecies will be copied.
-get_filename_component(current_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
 include(GetPrerequisites)
 
-message("Getting recursive dependencies for file: ${BIN_NAME}")
+message(STATUS "Getting recursive dependencies for file: ${BIN_NAME}")
 
 set(EXCLUDE_SYSTEM 1)
-set(RECURSE 1)
+set(RECURSE 0)
 get_filename_component(EXE_PATH ${BIN_NAME} PATH)
 
 get_prerequisites( ${BIN_NAME} RESULTS ${EXCLUDE_SYSTEM} ${RECURSE} "${EXE_PATH}" "${SEARCH_DIRS}" )
 
 foreach(DEP ${RESULTS})
-  Message("Processing dependency: ${DEP}")
+  Message(STATUS "Processing dependency: ${DEP}")
   get_filename_component(DEP_FILE ${DEP} NAME)
   set(DEP_FILES ${DEP_FILES} ${DEP_FILE})
 endforeach(DEP)
@@ -61,10 +60,10 @@ if(FOUND_FILES)
   foreach(FILE ${FOUND_FILES})
     get_filename_component(DST_FILE ${FILE} NAME)
     set(DST_FILE "${DST_PATH}/${DST_FILE}")
-    message("Copying ${FILE} to ${DST_FILE}")
+    message(STATUS "Copying ${FILE} to ${DST_FILE}")
     execute_process(
       COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE} ${DST_FILE}
       )
   endforeach(FILE ${FOUND_FILES})
 endif(FOUND_FILES)
-message("Success!")
+

indra/cmake/EXPAT.cmake

@@ -9,7 +9,10 @@ if (USESYSTEMLIBS)
 else (USESYSTEMLIBS)
     use_prebuilt_binary(expat)
     if (WINDOWS)
-        set(EXPAT_LIBRARIES expat)
+        set(EXPAT_LIBRARIES
+        debug libexpatd
+        optimized libexpat
+        )
     elseif (DARWIN)
         set(EXPAT_LIBRARIES ${ARCH_PREBUILT_DIRS_RELEASE}/libexpat.a)
     else ()