diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..44cbbb60f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,166 @@
+stages:
+ - build
+ - deploy
+
+variables:
+ VIEWER_USE_CRASHPAD: "TRUE"
+ VIEWER_CRASHPAD_URL: $SENTRY_DSN
+
+.win_build: &win_build
+ stage: build
+ tags:
+ - autobuild
+ - windows
+ before_script:
+ - pipenv install
+ script:
+ - If ($env:VIEWER_CHANNEL_TYPE -eq 'Project')
+ {
+ $env:VIEWER_CHANNEL_CODENAME = $env:CI_COMMIT_REF_NAME[8..100] -join ''
+ }
+ - pipenv run autobuild configure -c Release -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON
+ - pipenv run autobuild build -c Release --no-configure
+ - If ($env:VIEWER_USE_CRASHPAD -eq 'TRUE') {
+ - Push-Location .\build-vc-*\newview\Release\
+ - sentry-cli upload-dif --include-sources singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1.dll libcrypto-1_1.pdb libssl-1_1.dll libssl-1_1.pdb libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll libhunspell.dll libhunspell.pdb glod.dll
+ - Pop-Location }
+ artifacts:
+ name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+ expire_in: 2 week
+ paths:
+ - build-vc-*/newview/Release/build_data.json
+ - build-vc-*/newview/Release/singularity-bin.pdb
+ - build-vc-*/newview/Release/Singularity_*_Setup.exe
+
+.beta_rules: &beta_rules
+ only:
+ - /^.*-beta$/
+ except:
+ - branches
+
+.release_rules: &release_rules
+ only:
+ - /^.*-release$/
+ except:
+ - branches
+
+build:master:windows32:
+ <<: *win_build
+ interruptible: true
+ variables:
+ AUTOBUILD_ADDRSIZE: 32
+ VIEWER_CHANNEL_TYPE: Test
+ VIEWER_USE_CRASHPAD: "FALSE"
+ only:
+ - schedules
+
+build:master:windows64:
+ <<: *win_build
+ interruptible: true
+ variables:
+ AUTOBUILD_ADDRSIZE: 64
+ VIEWER_CHANNEL_TYPE: Test
+ VIEWER_USE_CRASHPAD: "FALSE"
+ only:
+ - schedules
+
+build:project:windows32:
+ <<: *win_build
+ interruptible: true
+ variables:
+ AUTOBUILD_ADDRSIZE: 32
+ VIEWER_CHANNEL_TYPE: Project
+ VIEWER_USE_CRASHPAD: "FALSE"
+ only:
+ - /^project-.*$/
+
+build:project:windows64:
+ <<: *win_build
+ interruptible: true
+ variables:
+ AUTOBUILD_ADDRSIZE: 64
+ VIEWER_CHANNEL_TYPE: Project
+ only:
+ - /^project-.*$/
+
+build:beta:windows32:
+ <<: *win_build
+ variables:
+ AUTOBUILD_ADDRSIZE: 32
+ VIEWER_CHANNEL_TYPE: Beta
+ VIEWER_USE_CRASHPAD: "FALSE"
+ <<: *beta_rules
+
+build:beta:windows64:
+ <<: *win_build
+ variables:
+ AUTOBUILD_ADDRSIZE: 64
+ VIEWER_CHANNEL_TYPE: Beta
+ <<: *beta_rules
+
+build:release:windows32:
+ <<: *win_build
+ variables:
+ AUTOBUILD_ADDRSIZE: 32
+ VIEWER_CHANNEL_TYPE: Release
+ VIEWER_USE_CRASHPAD: "FALSE"
+ <<: *release_rules
+
+build:release:windows64:
+ <<: *win_build
+ variables:
+ AUTOBUILD_ADDRSIZE: 64
+ VIEWER_CHANNEL_TYPE: Release
+ <<: *release_rules
+
+.deploy_template: &deploy_template
+ stage: deploy
+ tags:
+ - autobuild
+ - windows
+ script:
+ - $BuildData = Get-Content .\build-vc-64\newview\Release\build_data.json | ConvertFrom-Json
+ - $BuildChannelVersion = $BuildData."Channel" + ' ' + $BuildData."Version"
+ - $UploadDestViewerDir = $BuildChannelVersion.ToLower().Replace(" ", "/")
+ - $UploadDestURL = "https://pkg.alchemyviewer.org/repository/viewer/${UploadDestViewerDir}"
+
+ - $UploadParams = @{ UseBasicParsing = $true;
+ Method = "PUT";
+ Headers = @{
+ ContentType = "application/x-executable";
+ Authorization = "Basic $([System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("$env:AUTOBUILD_HTTP_USER`:$env:AUTOBUILD_HTTP_PASS")))"; };
+ Verbose = $true; };
+
+ - Push-Location .\build-vc-32\newview\Release\
+ - $FileNameWin32 = Get-ChildItem -Path . -Name -Include Singularity_*_Setup.exe
+ - Invoke-WebRequest @UploadParams -InFile .\$FileNameWin32 -Uri "${UploadDestURL}/${FileNameWin32}"
+ - Pop-Location
+
+ - Push-Location .\build-vc-64\newview\Release\
+ - $FileNameWin64 = Get-ChildItem -Path . -Name -Include Singularity_*_Setup.exe
+ - Invoke-WebRequest @UploadParams -InFile .\$FileNameWin64 -Uri "${UploadDestURL}/${FileNameWin64}"
+ - Pop-Location
+
+ - sentry-cli releases new $BuildChannelVersion
+ - sentry-cli releases set-commits --auto $BuildChannelVersion
+ - sentry-cli releases finalize $BuildChannelVersion
+ when: manual
+
+deploy_project:
+ <<: *deploy_template
+ environment:
+ name: qa
+ only:
+ - /^project-.*$/
+
+deploy_beta:
+ <<: *deploy_template
+ environment:
+ name: staging
+ <<: *beta_rules
+
+deploy_release:
+ <<: *deploy_template
+ environment:
+ name: production
+ <<: *release_rules
diff --git a/Pipfile b/Pipfile
index 03b834648..81e20cec2 100644
--- a/Pipfile
+++ b/Pipfile
@@ -8,7 +8,7 @@ name = "pypi"
[packages]
llbase = "*"
certifi = "*"
-autobuild = {hg = "https://bitbucket.org/alchemyviewer/autobuild-1.1"}
+autobuild = {git = "https://git.alchemyviewer.org/alchemy/autobuild.git"}
[requires]
python_version = "2.7"
diff --git a/autobuild.xml b/autobuild.xml
index f5f17ea95..5d3f1a881 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -410,11 +410,11 @@
archive
name
windows
@@ -424,18 +424,18 @@
archive
name
windows64
version
- 365c520b.6
+ ce32d093.7
curl
version
- 1.1.1320_73.1.12+gee4b49f+chromium-73.0.3683.75
+ 1.3.201911222103_78.3.7_gea7ef34_chromium-78.0.3904.108
elfio
version
- 2.00.03.192211300
+ 2.00.07.4
fonts
xmlrpc-epi
default
@@ -2968,7 +2970,7 @@
-G
Ninja
- -DWORD_SIZE:STRING=64
+ -DADDRESS_SIZE:STRING=64
name
@@ -2981,7 +2983,7 @@
windows
name
- windows64
+ windows
version_file
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 6b5c80cf0..3bcd9e161 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -3,12 +3,7 @@
# cmake_minimum_required should appear before any
# other commands to guarantee full compatibility
# with the version specified
-## prior to 2.8, the add_custom_target commands used in setting the version did not work correctly
-if(WIN32)
- cmake_minimum_required(VERSION 3.4 FATAL_ERROR)
-else()
- cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
-endif()
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
set(ROOT_PROJECT_NAME "Singularity" CACHE STRING
"The root project/makefile/solution name. Defaults to Singularity.")
@@ -16,11 +11,6 @@ project(${ROOT_PROJECT_NAME})
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-include(Variables)
-include(00-Common)
-include(BuildVersion)
-include(CTest)
-
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -29,6 +19,11 @@ if (NOT CMAKE_BUILD_TYPE)
"Build type. One of: Debug Release RelWithDebInfo" FORCE)
endif (NOT CMAKE_BUILD_TYPE)
+include(Variables)
+include(00-Common)
+include(BuildVersion)
+include(CTest)
+
add_subdirectory(deps)
add_subdirectory(cmake)
@@ -65,8 +60,10 @@ add_subdirectory(${LIBS_OPEN_PREFIX}plugins)
add_subdirectory(${VIEWER_PREFIX}newview/statemachine)
add_subdirectory(${VIEWER_PREFIX}newview)
-add_dependencies(viewer ${VIEWER_BRANDING_ID}-bin)
+add_dependencies(viewer ${VIEWER_BINARY_NAME})
+
if (WINDOWS)
- set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${VIEWER_BRANDING_ID}-bin)
+ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ PROPERTY VS_STARTUP_PROJECT ${VIEWER_BINARY_NAME})
endif (WINDOWS)
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 6dddeed57..653c72412 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -39,9 +39,9 @@ if (WINDOWS)
"${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /fp:fast"
CACHE STRING "C compiler release options" FORCE)
- if (WORD_SIZE EQUAL 32)
+ if (ADDRESS_SIZE EQUAL 32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
- endif (WORD_SIZE EQUAL 32)
+ endif (ADDRESS_SIZE EQUAL 32)
if (FULL_DEBUG_SYMS OR USE_CRASHPAD)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FULL")
@@ -103,9 +103,9 @@ if (WINDOWS)
)
endif (USE_LTO)
- if (WORD_SIZE EQUAL 32)
+ if (ADDRESS_SIZE EQUAL 32)
add_compile_options(/arch:SSE2)
- endif (WORD_SIZE EQUAL 32)
+ endif (ADDRESS_SIZE EQUAL 32)
if (NOT DISABLE_FATAL_WARNINGS)
add_definitions(/WX)
@@ -292,13 +292,13 @@ if (LINUX OR DARWIN)
set(CMAKE_C_FLAGS "${UNIX_WARNINGS} ${CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "${UNIX_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
- 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)
diff --git a/indra/cmake/ConfigurePkgConfig.cmake b/indra/cmake/ConfigurePkgConfig.cmake
index afbc36d63..a2d5b31e2 100644
--- a/indra/cmake/ConfigurePkgConfig.cmake
+++ b/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})
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index abe2a6f2a..00a9f33e9 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -13,10 +13,6 @@ include(LLCommon)
# set up platform specific lists of files that need to be copied
###################################################################
if(WINDOWS)
- set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
- set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
- include(InstallRequiredSystemLibrariesAL)
-
set(SHARED_LIB_STAGING_DIR_DEBUG "${SHARED_LIB_STAGING_DIR}/Debug")
set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo")
set(SHARED_LIB_STAGING_DIR_RELEASE "${SHARED_LIB_STAGING_DIR}/Release")
@@ -82,39 +78,19 @@ if(WINDOWS)
endif(ADDRESS_SIZE EQUAL 64)
if(NOT DISABLE_TCMALLOC)
- set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
- set(release_files ${release_files} libtcmalloc_minimal.dll)
+ list(APPEND debug_files libtcmalloc_minimal-debug.dll)
+ list(APPEND release_files libtcmalloc_minimal.dll)
endif(NOT DISABLE_TCMALLOC)
if(OPENAL)
- set(debug_files ${debug_files} alut.dll OpenAL32.dll)
- set(release_files ${release_files} alut.dll OpenAL32.dll)
+ list(APPEND debug_files alut.dll OpenAL32.dll)
+ list(APPEND release_files alut.dll OpenAL32.dll)
endif(OPENAL)
- if (FMODSTUDIO)
- set(debug_files ${debug_files} fmodL.dll)
- set(release_files ${release_files} fmod.dll)
- endif (FMODSTUDIO)
-
- foreach(redistfullfile IN LISTS CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
- get_filename_component(redistfilepath ${redistfullfile} DIRECTORY )
- get_filename_component(redistfilename ${redistfullfile} NAME)
- copy_if_different(
- ${redistfilepath}
- "${SHARED_LIB_STAGING_DIR_RELEASE}"
- out_targets
- ${redistfilename}
- )
- set(third_party_targets ${third_party_targets} ${out_targets})
-
- copy_if_different(
- ${redistfilepath}
- "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
- out_targets
- ${redistfilename}
- )
- set(third_party_targets ${third_party_targets} ${out_targets})
- endforeach()
+ 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")
@@ -191,13 +167,13 @@ elseif(LINUX)
)
if (USE_TCMALLOC)
- set(release_files ${release_files} "libtcmalloc_minimal.so")
+ list(APPEND release_files "libtcmalloc_minimal.so")
endif (USE_TCMALLOC)
- if (FMODSTUDIO)
- set(debug_files ${debug_files} "libfmodL.so")
- set(release_files ${release_files} "libfmod.so")
- endif (FMODSTUDIO)
+ if (USE_FMODSTUDIO)
+ list(APPEND debug_files "libfmodL.so")
+ list(APPEND release_files "libfmod.so")
+ endif (USE_FMODSTUDIO)
else(WINDOWS)
message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 2f8691c27..83ac0ac9c 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -1,7 +1,7 @@
# -*- cmake -*-
include(Variables)
-if (FMODSTUDIO)
+if (USE_FMODSTUDIO)
use_prebuilt_binary(fmodstudio)
if(WINDOWS)
set(lib_suffix .dll)
@@ -31,7 +31,7 @@ if (FMODSTUDIO)
)
set(FMODSTUDIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio)
-endif(FMODSTUDIO)
+endif(USE_FMODSTUDIO)
if(FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
set(FMOD ON)
@@ -41,7 +41,7 @@ if(FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
else (FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
message(STATUS "No support for FMOD Studio audio (need to set FMODSTUDIO_SDK_DIR?)")
set(FMOD OFF)
- set(FMODSTUDIO OFF)
+ set(USE_FMODSTUDIO OFF)
endif (FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
if (FMOD)
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 49ff3f5eb..d951bc55e 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -2,16 +2,16 @@
include(Prebuilt)
-if(WORD_SIZE EQUAL 64)
+if(ADDRESS_SIZE EQUAL 64)
set(DISABLE_TCMALLOC TRUE)
-endif(WORD_SIZE EQUAL 64)
+endif(ADDRESS_SIZE EQUAL 64)
if (STANDALONE)
include(FindGooglePerfTools)
else (STANDALONE)
- if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
+ if (LINUX OR WINDOWS AND NOT ADDRESS_SIZE EQUAL 64)
use_prebuilt_binary(gperftools)
- endif (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
+ endif (LINUX OR WINDOWS AND NOT ADDRESS_SIZE EQUAL 64)
if (WINDOWS AND NOT DISABLE_TCMALLOC)
set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
diff --git a/indra/cmake/InstallRequiredSystemLibrariesAL.cmake b/indra/cmake/InstallRequiredSystemLibrariesAL.cmake
deleted file mode 100644
index 0498da38c..000000000
--- a/indra/cmake/InstallRequiredSystemLibrariesAL.cmake
+++ /dev/null
@@ -1,741 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#[=======================================================================[.rst:
-InstallRequiredSystemLibraries
-------------------------------
-
-Include this module to search for compiler-provided system runtime
-libraries and add install rules for them. Some optional variables
-may be set prior to including the module to adjust behavior:
-
-``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS``
- Specify additional runtime libraries that may not be detected.
- After inclusion any detected libraries will be appended to this.
-
-``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP``
- Set to TRUE to skip calling the :command:`install(PROGRAMS)` command to
- allow the includer to specify its own install rule, using the value of
- ``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS`` to get the list of libraries.
-
-``CMAKE_INSTALL_DEBUG_LIBRARIES``
- Set to TRUE to install the debug runtime libraries when available
- with MSVC tools.
-
-``CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY``
- Set to TRUE to install only the debug runtime libraries with MSVC
- tools even if the release runtime libraries are also available.
-
-``CMAKE_INSTALL_UCRT_LIBRARIES``
- Set to TRUE to install the Windows Universal CRT libraries for
- app-local deployment (e.g. to Windows XP). This is meaningful
- only with MSVC from Visual Studio 2015 or higher.
-
- One may set a ``CMAKE_WINDOWS_KITS_10_DIR`` *environment variable*
- to an absolute path to tell CMake to look for Windows 10 SDKs in
- a custom location. The specified directory is expected to contain
- ``Redist/ucrt/DLLs/*`` directories.
-
-``CMAKE_INSTALL_MFC_LIBRARIES``
- Set to TRUE to install the MSVC MFC runtime libraries.
-
-``CMAKE_INSTALL_OPENMP_LIBRARIES``
- Set to TRUE to install the MSVC OpenMP runtime libraries
-
-``CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION``
- Specify the :command:`install(PROGRAMS)` command ``DESTINATION``
- option. If not specified, the default is ``bin`` on Windows
- and ``lib`` elsewhere.
-
-``CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS``
- Set to TRUE to disable warnings about required library files that
- do not exist. (For example, Visual Studio Express editions may
- not provide the redistributable files.)
-
-``CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT``
- Specify the :command:`install(PROGRAMS)` command ``COMPONENT``
- option. If not specified, no such option will be used.
-#]=======================================================================]
-
-cmake_policy(PUSH)
-cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
-
-set(_IRSL_HAVE_Intel FALSE)
-set(_IRSL_HAVE_MSVC FALSE)
-foreach(LANG IN ITEMS C CXX Fortran)
- if("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "Intel")
- if(NOT _IRSL_HAVE_Intel)
- get_filename_component(_Intel_basedir "${CMAKE_${LANG}_COMPILER}" PATH)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(_Intel_archdir intel64)
- else()
- set(_Intel_archdir x86)
- endif()
- set(_Intel_compiler_ver ${CMAKE_${LANG}_COMPILER_VERSION})
- if(WIN32)
- get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../redist/${_Intel_archdir}/compiler" ABSOLUTE)
- elseif(APPLE)
- get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib" ABSOLUTE)
- else()
- if(EXISTS "${_Intel_basedir}/../lib/${_Intel_archdir}_lin")
- get_filename_component(_Intel_redistdir "${_Intel_basedir}/../lib/${_Intel_archdir}" ABSOLUTE)
- else()
- get_filename_component(_Intel_redistdir "${_Intel_basedir}/../../compiler/lib/${_Intel_archdir}_lin" ABSOLUTE)
- endif()
- endif()
- set(_IRSL_HAVE_Intel TRUE)
- endif()
- elseif("${CMAKE_${LANG}_COMPILER_ID}" STREQUAL "MSVC")
- set(_IRSL_HAVE_MSVC TRUE)
- endif()
-endforeach()
-
-if(MSVC)
- file(TO_CMAKE_PATH "$ENV{SYSTEMROOT}" SYSTEMROOT)
-
- if(CMAKE_CL_64)
- if(MSVC_VERSION GREATER 1599)
- # VS 10 and later:
- set(CMAKE_MSVC_ARCH x64)
- else()
- # VS 9 and earlier:
- set(CMAKE_MSVC_ARCH amd64)
- endif()
- else()
- set(CMAKE_MSVC_ARCH x86)
- endif()
-
- get_filename_component(devenv_dir "${CMAKE_MAKE_PROGRAM}" PATH)
- get_filename_component(base_dir "${devenv_dir}/../.." ABSOLUTE)
-
- if(MSVC_VERSION EQUAL 1300)
- set(__install__libs
- "${SYSTEMROOT}/system32/msvcp70.dll"
- "${SYSTEMROOT}/system32/msvcr70.dll"
- )
- endif()
-
- if(MSVC_VERSION EQUAL 1310)
- set(__install__libs
- "${SYSTEMROOT}/system32/msvcp71.dll"
- "${SYSTEMROOT}/system32/msvcr71.dll"
- )
- endif()
-
- if(MSVC_TOOLSET_VERSION EQUAL 80)
- # Find the runtime library redistribution directory.
- get_filename_component(msvc_install_dir
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]" ABSOLUTE)
- if(DEFINED MSVC80_REDIST_DIR AND EXISTS "${MSVC80_REDIST_DIR}")
- set(MSVC_REDIST_DIR "${MSVC80_REDIST_DIR}") # use old cache entry
- endif()
- find_path(MSVC_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest
- PATHS
- "${msvc_install_dir}/../../VC/redist"
- "${base_dir}/VC/redist"
- )
- mark_as_advanced(MSVC_REDIST_DIR)
- set(MSVC_CRT_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT")
-
- # Install the manifest that allows DLLs to be loaded from the
- # directory containing the executable.
- if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- set(__install__libs
- "${MSVC_CRT_DIR}/Microsoft.VC80.CRT.manifest"
- "${MSVC_CRT_DIR}/msvcm80.dll"
- "${MSVC_CRT_DIR}/msvcp80.dll"
- "${MSVC_CRT_DIR}/msvcr80.dll"
- )
- else()
- set(__install__libs)
- endif()
-
- if(CMAKE_INSTALL_DEBUG_LIBRARIES)
- set(MSVC_CRT_DIR
- "${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugCRT")
- set(__install__libs ${__install__libs}
- "${MSVC_CRT_DIR}/Microsoft.VC80.DebugCRT.manifest"
- "${MSVC_CRT_DIR}/msvcm80d.dll"
- "${MSVC_CRT_DIR}/msvcp80d.dll"
- "${MSVC_CRT_DIR}/msvcr80d.dll"
- )
- endif()
- endif()
-
- if(MSVC_TOOLSET_VERSION EQUAL 90)
- # Find the runtime library redistribution directory.
- get_filename_component(msvc_install_dir
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]" ABSOLUTE)
- get_filename_component(msvc_express_install_dir
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0;InstallDir]" ABSOLUTE)
- if(DEFINED MSVC90_REDIST_DIR AND EXISTS "${MSVC90_REDIST_DIR}")
- set(MSVC_REDIST_DIR "${MSVC90_REDIST_DIR}") # use old cache entry
- endif()
- find_path(MSVC_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
- PATHS
- "${msvc_install_dir}/../../VC/redist"
- "${msvc_express_install_dir}/../../VC/redist"
- "${base_dir}/VC/redist"
- )
- mark_as_advanced(MSVC_REDIST_DIR)
- set(MSVC_CRT_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT")
-
- # Install the manifest that allows DLLs to be loaded from the
- # directory containing the executable.
- if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- set(__install__libs
- "${MSVC_CRT_DIR}/Microsoft.VC90.CRT.manifest"
- "${MSVC_CRT_DIR}/msvcm90.dll"
- "${MSVC_CRT_DIR}/msvcp90.dll"
- "${MSVC_CRT_DIR}/msvcr90.dll"
- )
- else()
- set(__install__libs)
- endif()
-
- if(CMAKE_INSTALL_DEBUG_LIBRARIES)
- set(MSVC_CRT_DIR
- "${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugCRT")
- set(__install__libs ${__install__libs}
- "${MSVC_CRT_DIR}/Microsoft.VC90.DebugCRT.manifest"
- "${MSVC_CRT_DIR}/msvcm90d.dll"
- "${MSVC_CRT_DIR}/msvcp90d.dll"
- "${MSVC_CRT_DIR}/msvcr90d.dll"
- )
- endif()
- endif()
-
- set(MSVC_REDIST_NAME "")
- set(_MSVC_DLL_VERSION "")
- set(_MSVC_IDE_VERSION "")
- if(MSVC_VERSION GREATER_EQUAL 2000)
- message(WARNING "MSVC ${MSVC_VERSION} not yet supported.")
- elseif(MSVC_VERSION_VERSION GREATER_EQUAL 143)
- message(WARNING "MSVC toolset v${MSVC_VERSION_VERSION} not yet supported.")
- elseif(MSVC_TOOLSET_VERSION EQUAL 142)
- set(MSVC_REDIST_NAME VC142)
- set(_MSVC_DLL_VERSION 140)
- set(_MSVC_IDE_VERSION 16)
- if(MSVC_VERSION EQUAL 1920)
- # VS2019 named this differently prior to update 1.
- set(MSVC_REDIST_NAME VC141)
- endif()
- elseif(MSVC_TOOLSET_VERSION EQUAL 141)
- set(MSVC_REDIST_NAME VC141)
- set(_MSVC_DLL_VERSION 140)
- set(_MSVC_IDE_VERSION 15)
- if(MSVC_VERSION EQUAL 1910)
- # VS2017 named this differently prior to update 3.
- set(MSVC_REDIST_NAME VC150)
- endif()
- elseif(MSVC_TOOLSET_VERSION)
- set(MSVC_REDIST_NAME VC${MSVC_TOOLSET_VERSION})
- math(EXPR _MSVC_DLL_VERSION "${MSVC_TOOLSET_VERSION} / 10 * 10")
- math(EXPR _MSVC_IDE_VERSION "${MSVC_TOOLSET_VERSION} / 10")
- endif()
-
- set(_MSVCRT_DLL_VERSION "")
- set(_MSVCRT_IDE_VERSION "")
- if(_MSVC_IDE_VERSION GREATER_EQUAL 10)
- set(_MSVCRT_DLL_VERSION "${_MSVC_DLL_VERSION}")
- set(_MSVCRT_IDE_VERSION "${_MSVC_IDE_VERSION}")
- endif()
-
- if(_MSVCRT_DLL_VERSION)
- set(v "${_MSVCRT_DLL_VERSION}")
- set(vs "${_MSVCRT_IDE_VERSION}")
-
- # Find the runtime library redistribution directory.
- if(vs VERSION_LESS 15 AND DEFINED MSVC${vs}_REDIST_DIR AND EXISTS "${MSVC${vs}_REDIST_DIR}")
- set(MSVC_REDIST_DIR "${MSVC${vs}_REDIST_DIR}") # use old cache entry
- endif()
- if(NOT vs VERSION_LESS 15)
- set(_vs_redist_paths "")
- cmake_host_system_information(RESULT _vs_dir QUERY VS_${vs}_DIR) # undocumented query
- if(IS_DIRECTORY "${_vs_dir}")
- file(GLOB _vs_redist_paths "${_vs_dir}/VC/Redist/MSVC/*")
- endif()
- unset(_vs_dir)
- else()
- get_filename_component(_vs_dir
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${vs}.0;InstallDir]" ABSOLUTE)
- set(programfilesx86 "ProgramFiles(x86)")
- set(_vs_redist_paths
- "${_vs_dir}/../../VC/redist"
- "${base_dir}/VC/redist"
- "$ENV{ProgramFiles}/Microsoft Visual Studio ${vs}.0/VC/redist"
- "$ENV{${programfilesx86}}/Microsoft Visual Studio ${vs}.0/VC/redist"
- )
- unset(_vs_dir)
- unset(programfilesx86)
- endif()
- find_path(MSVC_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.CRT PATHS ${_vs_redist_paths})
- unset(_vs_redist_paths)
- mark_as_advanced(MSVC_REDIST_DIR)
- set(MSVC_CRT_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.CRT")
-
- if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- set(__install__libs
- "${MSVC_CRT_DIR}/msvcp${v}.dll"
- )
- if(NOT vs VERSION_LESS 14)
- file(GLOB __msvcr_dlls "${MSVC_CRT_DIR}/*.dll")
- list(APPEND __install__libs ${__msvcr_dlls})
- else()
- list(APPEND __install__libs "${MSVC_CRT_DIR}/msvcr${v}.dll")
- endif()
- else()
- set(__install__libs)
- endif()
-
- if(CMAKE_INSTALL_DEBUG_LIBRARIES)
- set(MSVC_CRT_DIR
- "${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.DebugCRT")
- set(__install__libs ${__install__libs}
- "${MSVC_CRT_DIR}/msvcp${v}d.dll"
- )
- if(NOT vs VERSION_LESS 14)
- list(APPEND __install__libs
- "${MSVC_CRT_DIR}/vcruntime${v}d.dll"
- "${MSVC_CRT_DIR}/concrt${v}d.dll"
- )
- else()
- list(APPEND __install__libs "${MSVC_CRT_DIR}/msvcr${v}d.dll")
- endif()
- endif()
-
- if(CMAKE_INSTALL_UCRT_LIBRARIES AND NOT vs VERSION_LESS 14)
- # Find the Windows Kits directory.
- get_filename_component(windows_kits_dir
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots;KitsRoot10]" ABSOLUTE)
- set(programfilesx86 "ProgramFiles(x86)")
- if(";${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION};$ENV{UCRTVersion};$ENV{WindowsSDKVersion};" MATCHES [=[;(10\.[0-9.]+)[;\]]=])
- set(__ucrt_version "${CMAKE_MATCH_1}/")
- else()
- set(__ucrt_version "")
- endif()
- find_path(WINDOWS_KITS_DIR
- NAMES
- Redist/${__ucrt_version}ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
- Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll
- PATHS
- $ENV{CMAKE_WINDOWS_KITS_10_DIR}
- "${windows_kits_dir}"
- "$ENV{ProgramFiles}/Windows Kits/10"
- "$ENV{${programfilesx86}}/Windows Kits/10"
- )
- mark_as_advanced(WINDOWS_KITS_DIR)
-
- # Glob the list of UCRT DLLs.
- if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- if(EXISTS "${WINDOWS_KITS_DIR}/Redist/${__ucrt_version}ucrt/DLLs/${CMAKE_MSVC_ARCH}/ucrtbase.dll")
- file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/Redist/${__ucrt_version}ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
- else()
- file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/Redist/ucrt/DLLs/${CMAKE_MSVC_ARCH}/*.dll")
- endif()
- list(APPEND __install__libs ${__ucrt_dlls})
- endif()
- if(CMAKE_INSTALL_DEBUG_LIBRARIES)
- if(EXISTS "${WINDOWS_KITS_DIR}/bin/${__ucrt_version}${CMAKE_MSVC_ARCH}/ucrt/ucrtbased.dll")
- file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/bin/${__ucrt_version}${CMAKE_MSVC_ARCH}/ucrt/*.dll")
- else()
- file(GLOB __ucrt_dlls "${WINDOWS_KITS_DIR}/bin/${CMAKE_MSVC_ARCH}/ucrt/*.dll")
- endif()
- list(APPEND __install__libs ${__ucrt_dlls})
- endif()
- endif()
- endif()
-
- if(CMAKE_INSTALL_MFC_LIBRARIES)
- if(MSVC_VERSION EQUAL 1300)
- set(__install__libs ${__install__libs}
- "${SYSTEMROOT}/system32/mfc70.dll"
- )
- endif()
-
- if(MSVC_VERSION EQUAL 1310)
- set(__install__libs ${__install__libs}
- "${SYSTEMROOT}/system32/mfc71.dll"
- )
- endif()
-
- if(MSVC_VERSION EQUAL 1400)
- if(CMAKE_INSTALL_DEBUG_LIBRARIES)
- set(MSVC_MFC_DIR
- "${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugMFC")
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/Microsoft.VC80.DebugMFC.manifest"
- "${MSVC_MFC_DIR}/mfc80d.dll"
- "${MSVC_MFC_DIR}/mfc80ud.dll"
- "${MSVC_MFC_DIR}/mfcm80d.dll"
- "${MSVC_MFC_DIR}/mfcm80ud.dll"
- )
- endif()
-
- set(MSVC_MFC_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFC")
- # Install the manifest that allows DLLs to be loaded from the
- # directory containing the executable.
- if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/Microsoft.VC80.MFC.manifest"
- "${MSVC_MFC_DIR}/mfc80.dll"
- "${MSVC_MFC_DIR}/mfc80u.dll"
- "${MSVC_MFC_DIR}/mfcm80.dll"
- "${MSVC_MFC_DIR}/mfcm80u.dll"
- )
- endif()
-
- # include the language dll's for vs8 as well as the actual dll's
- set(MSVC_MFCLOC_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFCLOC")
- # Install the manifest that allows DLLs to be loaded from the
- # directory containing the executable.
- set(__install__libs ${__install__libs}
- "${MSVC_MFCLOC_DIR}/Microsoft.VC80.MFCLOC.manifest"
- "${MSVC_MFCLOC_DIR}/mfc80chs.dll"
- "${MSVC_MFCLOC_DIR}/mfc80cht.dll"
- "${MSVC_MFCLOC_DIR}/mfc80enu.dll"
- "${MSVC_MFCLOC_DIR}/mfc80esp.dll"
- "${MSVC_MFCLOC_DIR}/mfc80deu.dll"
- "${MSVC_MFCLOC_DIR}/mfc80fra.dll"
- "${MSVC_MFCLOC_DIR}/mfc80ita.dll"
- "${MSVC_MFCLOC_DIR}/mfc80jpn.dll"
- "${MSVC_MFCLOC_DIR}/mfc80kor.dll"
- )
- endif()
-
- if(MSVC_VERSION EQUAL 1500)
- if(CMAKE_INSTALL_DEBUG_LIBRARIES)
- set(MSVC_MFC_DIR
- "${MSVC_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugMFC")
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/Microsoft.VC90.DebugMFC.manifest"
- "${MSVC_MFC_DIR}/mfc90d.dll"
- "${MSVC_MFC_DIR}/mfc90ud.dll"
- "${MSVC_MFC_DIR}/mfcm90d.dll"
- "${MSVC_MFC_DIR}/mfcm90ud.dll"
- )
- endif()
-
- set(MSVC_MFC_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFC")
- # Install the manifest that allows DLLs to be loaded from the
- # directory containing the executable.
- if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/Microsoft.VC90.MFC.manifest"
- "${MSVC_MFC_DIR}/mfc90.dll"
- "${MSVC_MFC_DIR}/mfc90u.dll"
- "${MSVC_MFC_DIR}/mfcm90.dll"
- "${MSVC_MFC_DIR}/mfcm90u.dll"
- )
- endif()
-
- # include the language dll's for vs9 as well as the actual dll's
- set(MSVC_MFCLOC_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFCLOC")
- # Install the manifest that allows DLLs to be loaded from the
- # directory containing the executable.
- set(__install__libs ${__install__libs}
- "${MSVC_MFCLOC_DIR}/Microsoft.VC90.MFCLOC.manifest"
- "${MSVC_MFCLOC_DIR}/mfc90chs.dll"
- "${MSVC_MFCLOC_DIR}/mfc90cht.dll"
- "${MSVC_MFCLOC_DIR}/mfc90enu.dll"
- "${MSVC_MFCLOC_DIR}/mfc90esp.dll"
- "${MSVC_MFCLOC_DIR}/mfc90deu.dll"
- "${MSVC_MFCLOC_DIR}/mfc90fra.dll"
- "${MSVC_MFCLOC_DIR}/mfc90ita.dll"
- "${MSVC_MFCLOC_DIR}/mfc90jpn.dll"
- "${MSVC_MFCLOC_DIR}/mfc90kor.dll"
- )
- endif()
-
- set(_MFC_DLL_VERSION "")
- set(_MFC_IDE_VERSION "")
- if(_MSVC_IDE_VERSION GREATER_EQUAL 10)
- set(_MFC_DLL_VERSION ${_MSVC_DLL_VERSION})
- set(_MFC_IDE_VERSION ${_MSVC_IDE_VERSION})
- endif()
-
- if(_MFC_DLL_VERSION)
- set(v "${_MFC_DLL_VERSION}")
- set(vs "${_MFC_IDE_VERSION}")
-
- # Starting with VS 15 the MFC DLLs may be in a different directory.
- if (NOT vs VERSION_LESS 15)
- file(GLOB _MSVC_REDIST_DIRS "${MSVC_REDIST_DIR}/../*")
- find_path(MSVC_REDIST_MFC_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.MFC
- PATHS ${_MSVC_REDIST_DIRS} NO_DEFAULT_PATH)
- mark_as_advanced(MSVC_REDIST_MFC_DIR)
- unset(_MSVC_REDIST_DIRS)
- else()
- set(MSVC_REDIST_MFC_DIR "${MSVC_REDIST_DIR}")
- endif()
-
- # Multi-Byte Character Set versions of MFC are available as optional
- # addon since Visual Studio 12. So for version 12 or higher, check
- # whether they are available and exclude them if they are not.
-
- if(CMAKE_INSTALL_DEBUG_LIBRARIES)
- set(MSVC_MFC_DIR
- "${MSVC_REDIST_MFC_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.DebugMFC")
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/mfc${v}ud.dll"
- "${MSVC_MFC_DIR}/mfcm${v}ud.dll"
- )
- if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}d.dll")
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/mfc${v}d.dll"
- )
- endif()
- if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfcm${v}d.dll")
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/mfcm${v}d.dll"
- )
- endif()
- endif()
-
- set(MSVC_MFC_DIR "${MSVC_REDIST_MFC_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.MFC")
- if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/mfc${v}u.dll"
- "${MSVC_MFC_DIR}/mfcm${v}u.dll"
- )
- if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfc${v}.dll")
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/mfc${v}.dll"
- )
- endif()
- if("${v}" LESS 12 OR EXISTS "${MSVC_MFC_DIR}/mfcm${v}.dll")
- set(__install__libs ${__install__libs}
- "${MSVC_MFC_DIR}/mfcm${v}.dll"
- )
- endif()
- endif()
-
- # include the language dll's as well as the actual dll's
- set(MSVC_MFCLOC_DIR "${MSVC_REDIST_MFC_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.MFCLOC")
- set(__install__libs ${__install__libs}
- "${MSVC_MFCLOC_DIR}/mfc${v}chs.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}cht.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}deu.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}enu.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}esn.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}fra.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}ita.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}jpn.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}kor.dll"
- "${MSVC_MFCLOC_DIR}/mfc${v}rus.dll"
- )
- endif()
- endif()
-
- # MSVC 8 was the first version with OpenMP
- # Furthermore, there is no debug version of this
- if(CMAKE_INSTALL_OPENMP_LIBRARIES AND _IRSL_HAVE_MSVC)
- set(_MSOMP_DLL_VERSION ${_MSVC_DLL_VERSION})
- set(_MSOMP_IDE_VERSION ${_MSVC_IDE_VERSION})
-
- if(_MSOMP_DLL_VERSION)
- set(v "${_MSOMP_DLL_VERSION}")
- set(vs "${_MSOMP_IDE_VERSION}")
- set(MSVC_OPENMP_DIR "${MSVC_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.${MSVC_REDIST_NAME}.OPENMP")
-
- if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
- set(__install__libs ${__install__libs}
- "${MSVC_OPENMP_DIR}/vcomp${v}.dll")
- endif()
- endif()
- endif()
-
- foreach(lib
- ${__install__libs}
- )
- if(EXISTS ${lib})
- set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
- ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
- else()
- if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
- message(WARNING "system runtime library file does not exist: '${lib}'")
- # This warning indicates an incomplete Visual Studio installation
- # or a bug somewhere above here in this file.
- # If you would like to avoid this warning, fix the real problem, or
- # set CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS before including
- # this file.
- endif()
- endif()
- endforeach()
-endif()
-
-if(_IRSL_HAVE_Intel)
- unset(__install_libs)
- if(CMAKE_INSTALL_OPENMP_LIBRARIES)
- if(WIN32)
- list(APPEND __install_libs "${_Intel_redistdir}/libiomp5md.dll" "${_Intel_redistdir}/libiompstubs5md.dll")
- elseif(APPLE)
- list(APPEND __install_libs "${_Intel_redistdir}/libiomp5.dylib" "${_Intel_redistdir}/libiompstubs5.dylib")
- else()
- list(APPEND __install_libs "${_Intel_redistdir}/libiomp5.so" "${_Intel_redistdir}/libiompstubs5.so")
- if(_Intel_compiler_ver VERSION_LESS 17)
- list(APPEND __install_libs "${_Intel_redistdir}/libomp_db.so")
- endif()
- if(_Intel_compiler_ver VERSION_LESS 13)
- list(APPEND __install_libs "${_Intel_redistdir}/libiompprof5.so")
- endif()
- endif()
- endif()
- if(WIN32)
- set(__install_dirs "${_Intel_redistdir}/1033")
- if(EXISTS "${_Intel_redistdir}/1041")
- list(APPEND __install_dirs "${_Intel_redistdir}/1041")
- endif()
- if(_Intel_compiler_ver VERSION_LESS 18)
- list(APPEND __install_dirs "${_Intel_redistdir}/irml" "${_Intel_redistdir}/irml_c")
- endif()
- foreach(__Intel_lib IN ITEMS cilkrts20.dll libchkp.dll libioffload_host.dll libirngmd.dll
- libmmd.dll libmmdd.dll libmpx.dll liboffload.dll svml_dispmd.dll)
-
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
- list(APPEND __install_libs "${_Intel_redistdir}/libgfxoffload.dll")
- endif()
- if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
- foreach(__Intel_lib IN ITEMS ifdlg100.dll libicaf.dll libifcoremd.dll libifcoremdd.dll libifcorert.dll libifcorertd.dll libifportmd.dll)
-
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- endif()
- elseif(APPLE)
- foreach(__Intel_lib IN ITEMS libchkp.dylib libcilkrts.5.dylib libcilkrts.dylib libimf.dylib libintlc.dylib libirc.dylib libirng.dylib libsvml.dylib)
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
- if(_Intel_compiler_ver VERSION_LESS 17)
- list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.dylib")
- endif()
- endif()
- if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
- foreach(__Intel_lib IN ITEMS libifcore.dylib libifcoremt.dylib libifport.dylib libifportmt.dylib)
-
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- endif()
- else()
- foreach(__Intel_lib IN ITEMS libchkp.so libcilkrts.so libcilkrts.so.5 libimf.so libintlc.so libintlc.so.5 libirc.so libpdbx.so libpdbx.so.5 libsvml.so)
-
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- if(_Intel_compiler_ver VERSION_GREATER_EQUAL 13)
- foreach(__Intel_lib IN ITEMS libirng.so liboffload.so liboffload.so.5)
-
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- endif()
- if(CMAKE_C_COMPILER_ID STREQUAL Intel OR CMAKE_CXX_COMPILER_ID STREQUAL Intel)
- set(__install_dirs "${_Intel_redistdir}/irml")
- list(APPEND __install_libs "${_Intel_redistdir}/cilk_db.so")
- if(_Intel_compiler_ver VERSION_GREATER_EQUAL 15)
- list(APPEND __install_libs "${_Intel_redistdir}/libistrconv.so" "${_Intel_redistdir}/libgfxoffload.so")
- endif()
- endif()
- if(_Intel_compiler_ver VERSION_GREATER_EQUAL 16)
- foreach(__Intel_lib IN ITEMS libioffload_host.so libioffload_host.so.5 libioffload_target.so libioffload_target.so.5 libmpx.so offload_main)
-
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- endif()
- if(_Intel_compiler_ver VERSION_LESS 15)
- foreach(__Intel_lib IN ITEMS libcxaguard.so libcxaguard.so.5)
-
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- endif()
- if(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
- foreach(__Intel_lib IN ITEMS libicaf.so libifcore.so libifcore.so.5 libifcoremt.so libifcoremt.so.5 libifport.so libifport.so.5)
-
- list(APPEND __install_libs "${_Intel_redistdir}/${__Intel_lib}")
- endforeach()
- endif()
- endif()
-
- foreach(lib IN LISTS __install_libs)
- if(EXISTS ${lib})
- list(APPEND CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${lib})
- else()
- if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
- message(WARNING "system runtime library file does not exist: '${lib}'")
- endif()
- endif()
- endforeach()
-
- foreach(dir IN LISTS __install_dirs)
- if(EXISTS ${dir})
- list(APPEND CMAKE_INSTALL_SYSTEM_RUNTIME_DIRECTORIES ${dir})
- else()
- if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
- message(WARNING "system runtime library file does not exist: '${dir}'")
- endif()
- endif()
- endforeach()
-endif()
-
-if(WATCOM)
- get_filename_component( CompilerPath ${CMAKE_C_COMPILER} PATH )
- if(CMAKE_C_COMPILER_VERSION)
- set(_compiler_version ${CMAKE_C_COMPILER_VERSION})
- else()
- set(_compiler_version ${CMAKE_CXX_COMPILER_VERSION})
- endif()
- string(REGEX MATCHALL "[0-9]+" _watcom_version_list "${_compiler_version}")
- list(GET _watcom_version_list 0 _watcom_major)
- list(GET _watcom_version_list 1 _watcom_minor)
- set( __install__libs
- ${CompilerPath}/clbr${_watcom_major}${_watcom_minor}.dll
- ${CompilerPath}/mt7r${_watcom_major}${_watcom_minor}.dll
- ${CompilerPath}/plbr${_watcom_major}${_watcom_minor}.dll )
- foreach(lib
- ${__install__libs}
- )
- if(EXISTS ${lib})
- set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
- ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib})
- else()
- if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS)
- message(WARNING "system runtime library file does not exist: '${lib}'")
- # This warning indicates an incomplete Watcom installation
- # or a bug somewhere above here in this file.
- # If you would like to avoid this warning, fix the real problem, or
- # set CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS before including
- # this file.
- endif()
- endif()
- endforeach()
-endif()
-
-
-# Include system runtime libraries in the installation if any are
-# specified by CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS.
-if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
- if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP)
- if(NOT CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION)
- if(WIN32)
- set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION bin)
- else()
- set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION lib)
- endif()
- endif()
- if(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT)
- set(_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT
- COMPONENT ${CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT})
- endif()
- install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
- DESTINATION ${CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION}
- ${_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT}
- )
-
- install(DIRECTORY ${CMAKE_INSTALL_SYSTEM_RUNTIME_DIRECTORIES}
- DESTINATION ${CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION}
- ${_CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT}
- )
- endif()
-endif()
-
-cmake_policy(POP)
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index 6cc325495..169ba4eb6 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -10,7 +10,6 @@ if (DARWIN)
find_library(CORESERVICES_LIBRARY CoreServices)
endif (DARWIN)
-
set(LLCOMMON_INCLUDE_DIRS
${LIBS_OPEN_DIR}/cwdebug
${LIBS_OPEN_DIR}/llcommon
@@ -19,14 +18,7 @@ set(LLCOMMON_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
)
-if (LINUX)
- # In order to support using ld.gold on linux, we need to explicitely
- # specify all libraries that llcommon uses.
- # llcommon uses `clock_gettime' which is provided by librt on linux.
- set(LLCOMMON_LIBRARIES llcommon rt)
-else (LINUX)
- set(LLCOMMON_LIBRARIES llcommon)
-endif (LINUX)
+set(LLCOMMON_LIBRARIES llcommon)
set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a shared library.")
if(LLCOMMON_LINK_SHARED)
diff --git a/indra/cmake/LLPlugin.cmake b/indra/cmake/LLPlugin.cmake
index 399cb332d..9722f16c3 100644
--- a/indra/cmake/LLPlugin.cmake
+++ b/indra/cmake/LLPlugin.cmake
@@ -5,10 +5,4 @@ set(LLPLUGIN_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llplugin
)
-if (LINUX)
- # In order to support using ld.gold on linux, we need to explicitely
- # specify all libraries that llplugin uses.
- set(LLPLUGIN_LIBRARIES llplugin pthread)
-else (LINUX)
- set(LLPLUGIN_LIBRARIES llplugin)
-endif (LINUX)
+set(LLPLUGIN_LIBRARIES llplugin)
diff --git a/indra/cmake/NVAPI.cmake b/indra/cmake/NVAPI.cmake
index 080d8fcf7..3cdf5ca47 100644
--- a/indra/cmake/NVAPI.cmake
+++ b/indra/cmake/NVAPI.cmake
@@ -2,18 +2,18 @@
include(Prebuilt)
include(Variables)
-if (NVAPI)
+if (USE_NVAPI)
if (WINDOWS)
use_prebuilt_binary(nvapi)
- if (WORD_SIZE EQUAL 32)
+ if (ADDRESS_SIZE EQUAL 32)
set(NVAPI_LIBRARY nvapi)
- elseif (WORD_SIZE EQUAL 64)
+ elseif (ADDRESS_SIZE EQUAL 64)
set(NVAPI_LIBRARY nvapi64)
- endif (WORD_SIZE EQUAL 32)
+ endif (ADDRESS_SIZE EQUAL 32)
else (WINDOWS)
set(NVAPI_LIBRARY "")
endif (WINDOWS)
-else (NVAPI)
+else (USE_NVAPI)
set(NVAPI_LIBRARY "")
-endif (NVAPI)
+endif (USE_NVAPI)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 51e10a09a..b1afa31e2 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -17,6 +17,14 @@ if(NOT DEFINED COMMON_CMAKE_DIR)
set(COMMON_CMAKE_DIR "${CMAKE_SOURCE_DIR}/cmake")
endif(NOT DEFINED COMMON_CMAKE_DIR)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+# https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/
+set(CMAKE_MACOSX_RPATH ON)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH OFF)
+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -28,23 +36,40 @@ set(LIBS_OPEN_PREFIX)
set(SCRIPTS_PREFIX ../scripts)
set(VIEWER_PREFIX)
set(INTEGRATION_TESTS_PREFIX)
+
option(LL_TESTS "Build and run unit and integration tests (disable for build timing runs to reduce variation" OFF)
option(BUILD_TESTING "Build test suite" OFF)
+option(UNATTENDED "Disable use of uneeded tooling for automated builds" OFF)
+# Compiler and toolchain options
+option(USESYSTEMLIBS "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
+option(STANDALONE "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
+if (USESYSTEMLIBS)
+ set(STANDALONE ON)
+elseif (STANDALONE)
+ set(USESYSTEMLIBS ON)
+endif (USESYSTEMLIBS)
option(INCREMENTAL_LINK "Use incremental linking on win32 builds (enable for faster links on some machines)" OFF)
option(USE_PRECOMPILED_HEADERS "Enable use of precompiled header directives where supported." ON)
-option(USE_LTO "Enable Whole Program Optimization and related folding and binary reduction routines" OFF)
-option(UNATTENDED "Disable use of uneeded tooling for automated builds" OFF)
+option(USE_LTO "Enable global and interprocedural optimizations" OFF)
# Configure crash reporting
option(USE_CRASHPAD "Build support for crashpad reporting engine" OFF)
-set(CRASHPAD_URL "" CACHE STRING "Crashpad endpoint url")
+if (DEFINED ENV{VIEWER_USE_CRASHPAD})
+ set(USE_CRASHPAD $ENV{VIEWER_USE_CRASHPAD})
+endif()
+
+if (DEFINED ENV{VIEWER_CRASHPAD_URL})
+ set(CRASHPAD_URL $ENV{VIEWER_CRASHPAD_URL} CACHE STRING "Viewer Channel Base Name")
+else()
+ set(CRASHPAD_URL "" CACHE STRING "Crashpad endpoint url")
+endif()
+
set(VIEWER_SYMBOL_FILE "" CACHE STRING "Name of tarball into which to place symbol files")
# Media Plugins
option(ENABLE_MEDIA_PLUGINS "Turn off building media plugins if they are imported by third-party library mechanism" ON)
option(LIBVLCPLUGIN "Turn off building support for libvlc plugin" ON)
-
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(LIBVLCPLUGIN OFF)
endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -54,13 +79,11 @@ set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds
set(DISABLE_FATAL_WARNINGS TRUE CACHE BOOL "Set this to FALSE to enable fatal warnings.")
# Audio Engines
-option(FMODSTUDIO "Build with support for the FMOD Studio audio engine" ON)
-
-# Window implementation
-option(LLWINDOW_SDL2 "Use SDL2 for window and input handling" OFF)
+option(USE_FMODSTUDIO "Build with support for the FMOD Studio audio engine" OFF)
# Proprietary Library Features
-option(NVAPI "Use nvapi driver interface library" OFF)
+option(USE_NVAPI "Use nvapi driver interface library" OFF)
+
if(LIBS_CLOSED_DIR)
file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
@@ -87,7 +110,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries")
endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
set(TEMPLATE_VERIFIER_OPTIONS "" CACHE STRING "Options for scripts/template_verifier.py")
-set(TEMPLATE_VERIFIER_MASTER_URL "https://forge.alchemyviewer.org/alchemy/tools/Master-Message-Template/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
+set(TEMPLATE_VERIFIER_MASTER_URL "https://git.alchemyviewer.org/alchemy/master-message-template/raw/master/message_template.msg" CACHE STRING "Location of the master message template")
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
@@ -96,7 +119,6 @@ endif (NOT CMAKE_BUILD_TYPE)
# If someone has specified an address size, use that to determine the
# architecture. Otherwise, let the architecture specify the address size.
-set(ADDRESS_SIZE ${WORD_SIZE})
if (ADDRESS_SIZE EQUAL 32)
#message(STATUS "ADDRESS_SIZE is 32")
set(ARCH i686)
@@ -160,7 +182,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- set(DARWIN 1)
+ set(DARWIN ON BOOL FORCE)
# Architecture
set(CMAKE_OSX_SYSROOT macosx10.14)
@@ -200,57 +222,60 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(LL_ARCH_DIR universal-darwin)
endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+# Platform specific
+if (WINDOWS)
+ option(LLWINDOW_SDL2 "Use SDL2 for window and input handling. Windows only" OFF)
+endif()
+
# Default deploy grid
set(GRID agni CACHE STRING "Target Grid")
-set(VIEWER_PRODUCT_NAME "Singularity" CACHE STRING "Viewer Base Name")
-string(TOLOWER ${VIEWER_PRODUCT_NAME} VIEWER_PRODUCT_NAME_LOWER)
+if (DEFINED ENV{VIEWER_CHANNEL_BASE})
+ set(VIEWER_CHANNEL_BASE $ENV{VIEWER_CHANNEL_BASE} CACHE STRING "Viewer Channel Base Name" FORCE)
+else()
+ set(VIEWER_CHANNEL_BASE "Singularity" CACHE STRING "Viewer Channel Base Name")
+endif()
+
+if (DEFINED ENV{VIEWER_CHANNEL_TYPE})
+ set(VIEWER_CHANNEL_TYPE $ENV{VIEWER_CHANNEL_TYPE} CACHE STRING "Viewer Channel Type Name" FORCE)
+else()
+ set(VIEWER_CHANNEL_TYPE "Test" CACHE STRING "Viewer Channel Type Name")
+endif()
+
+if (DEFINED ENV{VIEWER_CHANNEL_CODENAME})
+ set(VIEWER_CHANNEL_CODENAME $ENV{VIEWER_CHANNEL_CODENAME} CACHE STRING "Viewer Channel Code Name for Project type" FORCE)
+else()
+ set(VIEWER_CHANNEL_CODENAME "Default" CACHE STRING "Viewer Channel Code Name for Project type")
+endif()
+
+if("${VIEWER_CHANNEL_TYPE}" STREQUAL "Project")
+ set(VIEWER_CHANNEL "${VIEWER_CHANNEL_BASE} ${VIEWER_CHANNEL_TYPE} ${VIEWER_CHANNEL_CODENAME}")
+else()
+ set(VIEWER_CHANNEL "${VIEWER_CHANNEL_BASE} ${VIEWER_CHANNEL_TYPE}")
+endif()
+
+string(TOLOWER "${VIEWER_CHANNEL_BASE}" VIEWER_BRANDING_ID)
+string(REPLACE " " "-" VIEWER_BRANDING_ID ${VIEWER_BRANDING_ID})
+set(VIEWER_BINARY_NAME "${VIEWER_BRANDING_ID}-bin" CACHE STRING
+ "The name of the viewer executable to create.")
-set(VIEWER_CHANNEL_BASE "Test" CACHE STRING "Viewer Channel Name")
-set(VIEWER_CHANNEL "${VIEWER_PRODUCT_NAME} ${VIEWER_CHANNEL_BASE}")
-string(TOLOWER ${VIEWER_CHANNEL} VIEWER_CHANNEL_LOWER)
string(REPLACE " " "" VIEWER_CHANNEL_ONEWORD ${VIEWER_CHANNEL})
+set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_ONEWORD} CACHE STRING "Prefix used for resulting artifacts.")
option(VIEWER_CHANNEL_GRK "Greek character(s) to represent the viewer channel for support purposes, override only for special branches" "")
if (NOT VIEWER_CHANNEL_GRK)
- if (VIEWER_CHANNEL_BASE MATCHES "Test")
- set(VIEWER_CHANNEL_GRK "\\u03C4") # "τ"
- elseif (VIEWER_CHANNEL_BASE MATCHES "Alpha")
- set(VIEWER_CHANNEL_GRK "\\u03B1") # "α"
- elseif (VIEWER_CHANNEL_BASE MATCHES "Beta")
- set(VIEWER_CHANNEL_GRK "\\u03B2") # "β"
- endif ()
+ if (VIEWER_CHANNEL_TYPE MATCHES "Test")
+ set(VIEWER_CHANNEL_GRK "\\u03C4") # "τ"
+ elseif (VIEWER_CHANNEL_TYPE MATCHES "Alpha")
+ set(VIEWER_CHANNEL_GRK "\\u03B1") # "α"
+ elseif (VIEWER_CHANNEL_TYPE MATCHES "Beta")
+ set(VIEWER_CHANNEL_GRK "\\u03B2") # "β"
+ endif ()
endif (NOT VIEWER_CHANNEL_GRK)
-if(VIEWER_CHANNEL_LOWER MATCHES "^${VIEWER_PRODUCT_NAME_LOWER} release")
- set(VIEWER_PACKAGE_ID "${VIEWER_PRODUCT_NAME}Release")
- set(VIEWER_EXE_STRING "${VIEWER_PRODUCT_NAME}Viewer")
- set(VIEWER_SHORTCUT_STRING "${VIEWER_PRODUCT_NAME} Viewer")
-else()
- set(VIEWER_PACKAGE_ID ${VIEWER_CHANNEL_ONEWORD})
- set(VIEWER_EXE_STRING ${VIEWER_CHANNEL_ONEWORD})
- set(VIEWER_SHORTCUT_STRING ${VIEWER_CHANNEL})
-endif()
-
-set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_ONEWORD} CACHE STRING "Prefix used for resulting artifacts.")
-
-set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id")
-
option(ENABLE_SIGNING "Enable signing the viewer" OFF)
set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
-set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
-# Compiler and toolchain options
-option(USESYSTEMLIBS "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
-option(STANDALONE "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
-if (USESYSTEMLIBS)
- set(STANDALONE ON)
-elseif (STANDALONE)
- set(USESYSTEMLIBS ON)
-endif (USESYSTEMLIBS)
-
-
-
source_group("CMake Rules" FILES CMakeLists.txt)
endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
diff --git a/indra/deps/CMakeLists.txt b/indra/deps/CMakeLists.txt
index 47b676d2c..fb2ed3050 100644
--- a/indra/deps/CMakeLists.txt
+++ b/indra/deps/CMakeLists.txt
@@ -3,21 +3,22 @@ project(deps)
include(FetchContent)
set(CMAKE_FOLDER "Third Party")
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
- GIT_TAG v2.10.0
+ GIT_TAG v2.11.0
)
FetchContent_Declare(
fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
- GIT_TAG 7512a55aa3ae309587ca89668ef9ec4074a51a1f
+ GIT_TAG 6.1.2
)
FetchContent_Declare(
absl
GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
- GIT_TAG ab3552a18964e7063c8324f45b3896a6a20b08a8
+ GIT_TAG 29235139149790f5afc430c11cec8f1eb1677607
)
# This is a hack because absl has dumb cmake
@@ -43,4 +44,5 @@ if(WINDOWS)
FetchContent_MakeAvailable(fmt)
endif()
-set(CMAKE_FOLDER "")
+unset(CMAKE_FOLDER)
+unset(CMAKE_POSITION_INDEPENDENT_CODE)
diff --git a/indra/llappearance/llwearabletype.h b/indra/llappearance/llwearabletype.h
index 6dec79fcb..ec946d5ad 100644
--- a/indra/llappearance/llwearabletype.h
+++ b/indra/llappearance/llwearabletype.h
@@ -58,6 +58,7 @@ public:
WT_UNKNOWN = 17, // Singu note: used for corrupt wearables that do not have their type set in the inventory database.
// While all the above values are serialized and stored in the database, this value is local only:
// When a new item with value 17 is added by upstream, just increase this value to 18 (and WT_COUNT to 19).
+ // Keep WT_UNKNOWN and WT_COUNT in sync with llinventory.cpp
WT_COUNT = 18,
WT_INVALID = 255,
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt
index 20456f5dc..92aa14ddc 100644
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -43,7 +43,7 @@ set(llaudio_HEADER_FILES
llwindgen.h
)
-if (FMODSTUDIO)
+if (USE_FMODSTUDIO)
include_directories(
${FMODSTUDIO_INCLUDE_DIR}
)
@@ -58,7 +58,7 @@ if (FMODSTUDIO)
lllistener_fmodstudio.h
llstreamingaudio_fmodstudio.h
)
-endif (FMODSTUDIO)
+endif (USE_FMODSTUDIO)
if (OPENAL)
list(APPEND llaudio_SOURCE_FILES
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index cae62271d..9baf87d9d 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -269,12 +269,6 @@ list(APPEND llcommon_SOURCE_FILES ${cwdebug_SOURCE_FILES})
list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
-if(NOT WORD_SIZE EQUAL 32)
- if(NOT WINDOWS)
- add_definitions(-fPIC)
- endif(NOT WINDOWS)
-endif(NOT WORD_SIZE EQUAL 32)
-
if(LLCOMMON_LINK_SHARED)
add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
if(WINDOWS)
@@ -286,6 +280,8 @@ else(LLCOMMON_LINK_SHARED)
add_library (llcommon ${llcommon_SOURCE_FILES})
endif(LLCOMMON_LINK_SHARED)
+set_target_properties(llcommon PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
target_link_libraries(
llcommon
PUBLIC
@@ -304,6 +300,7 @@ target_link_libraries(
${Boost_SYSTEM_LIBRARY}
${CORESERVICES_LIBRARY}
${URIPARSER_LIBRARY}
+ ${RT_LIBRARY}
)
if (DARWIN)
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 3cb14a2ca..f6c58513b 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -1338,7 +1338,7 @@ namespace LLError
}
#if LL_WINDOWS
- // VC80 was optimizing the error away.
+ // MSVC is optimizing the error away.
#pragma optimize("", off)
#endif
void crashAndLoop(const std::string& message)
@@ -1347,9 +1347,8 @@ namespace LLError
DoutFatal(dc::core, message);
#else
// Now, we go kaboom!
- int* make_me_crash = NULL;
-
- *make_me_crash = 0;
+ int* make_me_crash = nullptr;
+ *make_me_crash = 0xDEADBEEF;
while(true)
{
diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp
index e68ccd2ad..0b7677fad 100644
--- a/indra/llcommon/llfile.cpp
+++ b/indra/llcommon/llfile.cpp
@@ -282,6 +282,11 @@ int LLFile::rename_nowarn(const std::string& filename, const std::string& newnam
int rc = _wrename(utf16filename.c_str(),utf16newname.c_str());
#else
int rc = ::rename(filename.c_str(),newname.c_str());
+ if (rc == -1 && errno == EXDEV)
+ {
+ rc = std::system(("mv '" + filename + "' '" + newname + '\'').data());
+ errno = 0;
+ }
#endif
return rc;
}
diff --git a/indra/llcommon/llsd.cpp b/indra/llcommon/llsd.cpp
index 3883b7e8e..73a0ab3e7 100644
--- a/indra/llcommon/llsd.cpp
+++ b/indra/llcommon/llsd.cpp
@@ -126,9 +126,9 @@ public:
virtual Date asDate() const { return LLDate(); }
virtual URI asURI() const { return LLURI(); }
virtual const Binary& asBinary() const { static const std::vector empty; return empty; }
-
- virtual const String& asStringRef() const { static const std::string empty; return empty; }
+ virtual const String& asStringRef() const { static const std::string empty; return empty; }
+
virtual bool has(const String&) const { return false; }
virtual LLSD get(const String&) const { return LLSD(); }
virtual LLSD getKeys() const { return LLSD::emptyArray(); }
@@ -142,11 +142,11 @@ public:
virtual const std::map& map() const { static const std::map empty; return empty; }
virtual std::map& map() { static std::map empty; return empty; }
- LLSD::map_const_iterator beginMap() const { return endMap(); }
+ LLSD::map_const_iterator beginMap() const { return map().begin(); }
LLSD::map_const_iterator endMap() const { return map().end(); }
virtual const std::vector& array() const { static const std::vector empty; return empty; }
virtual std::vector& array() { static std::vector empty; return empty; }
- LLSD::array_const_iterator beginArray() const { return endArray(); }
+ LLSD::array_const_iterator beginArray() const { return array().begin(); }
LLSD::array_const_iterator endArray() const { return array().end(); }
virtual void dumpStats() const;
@@ -187,10 +187,11 @@ namespace
public:
ImplBase(DataRef value) : mValue(value) { }
- virtual LLSD::Type type() const { return T; }
+ LLSD::Type type() const override { return T; }
using LLSD::Impl::assign; // Unhiding base class virtuals...
- virtual void assign(LLSD::Impl*& var, DataRef value) {
+ void assign(LLSD::Impl*& var, DataRef value) override
+ {
if (shared())
{
Impl::assign(var, value);
@@ -203,16 +204,16 @@ namespace
};
- class ImplBoolean
+ class ImplBoolean final
: public ImplBase
{
public:
ImplBoolean(LLSD::Boolean v) : Base(v) { }
- virtual LLSD::Boolean asBoolean() const { return mValue; }
- virtual LLSD::Integer asInteger() const { return mValue ? 1 : 0; }
- virtual LLSD::Real asReal() const { return mValue ? 1 : 0; }
- virtual LLSD::String asString() const;
+ LLSD::Boolean asBoolean() const override { return mValue; }
+ LLSD::Integer asInteger() const override { return mValue ? 1 : 0; }
+ LLSD::Real asReal() const override { return mValue ? 1 : 0; }
+ LLSD::String asString() const override;
};
LLSD::String ImplBoolean::asString() const
@@ -224,32 +225,32 @@ namespace
{ return mValue ? "true" : ""; }
- class ImplInteger
+ class ImplInteger final
: public ImplBase
{
public:
ImplInteger(LLSD::Integer v) : Base(v) { }
- virtual LLSD::Boolean asBoolean() const { return mValue != 0; }
- virtual LLSD::Integer asInteger() const { return mValue; }
- virtual LLSD::Real asReal() const { return mValue; }
- virtual LLSD::String asString() const;
+ LLSD::Boolean asBoolean() const override { return mValue != 0; }
+ LLSD::Integer asInteger() const override { return mValue; }
+ LLSD::Real asReal() const override { return mValue; }
+ LLSD::String asString() const override;
};
LLSD::String ImplInteger::asString() const
{ return llformat("%d", mValue); }
- class ImplReal
+ class ImplReal final
: public ImplBase
{
public:
ImplReal(LLSD::Real v) : Base(v) { }
- virtual LLSD::Boolean asBoolean() const;
- virtual LLSD::Integer asInteger() const;
- virtual LLSD::Real asReal() const { return mValue; }
- virtual LLSD::String asString() const;
+ LLSD::Boolean asBoolean() const override;
+ LLSD::Integer asInteger() const override;
+ LLSD::Real asReal() const override { return mValue; }
+ LLSD::String asString() const override;
};
LLSD::Boolean ImplReal::asBoolean() const
@@ -262,21 +263,21 @@ namespace
{ return llformat("%lg", mValue); }
- class ImplString
+ class ImplString final
: public ImplBase
{
public:
ImplString(const LLSD::String& v) : Base(v) { }
- virtual LLSD::Boolean asBoolean() const { return !mValue.empty(); }
- virtual LLSD::Integer asInteger() const;
- virtual LLSD::Real asReal() const;
- virtual LLSD::String asString() const { return mValue; }
- virtual LLSD::UUID asUUID() const { return LLUUID(mValue); }
- virtual LLSD::Date asDate() const { return LLDate(mValue); }
- virtual LLSD::URI asURI() const { return LLURI(mValue); }
- virtual int size() const { return mValue.size(); }
- virtual const LLSD::String& asStringRef() const { return mValue; }
+ LLSD::Boolean asBoolean() const override { return !mValue.empty(); }
+ LLSD::Integer asInteger() const override;
+ LLSD::Real asReal() const override;
+ LLSD::String asString() const override { return mValue; }
+ LLSD::UUID asUUID() const override { return LLUUID(mValue); }
+ LLSD::Date asDate() const override { return LLDate(mValue); }
+ LLSD::URI asURI() const override { return LLURI(mValue); }
+ int size() const override { return mValue.size(); }
+ const LLSD::String& asStringRef() const override { return mValue; }
};
LLSD::Integer ImplString::asInteger() const
@@ -306,18 +307,18 @@ namespace
}
- class ImplUUID
+ class ImplUUID final
: public ImplBase
{
public:
ImplUUID(const LLSD::UUID& v) : Base(v) { }
- virtual LLSD::String asString() const{ return mValue.asString(); }
- virtual LLSD::UUID asUUID() const { return mValue; }
+ LLSD::String asString() const override { return mValue.asString(); }
+ LLSD::UUID asUUID() const override { return mValue; }
};
- class ImplDate
+ class ImplDate final
: public ImplBase
{
public:
@@ -325,41 +326,42 @@ namespace
: ImplBase(v)
{ }
- virtual LLSD::Integer asInteger() const
+ LLSD::Integer asInteger() const override
{
return (LLSD::Integer)(mValue.secondsSinceEpoch());
}
- virtual LLSD::Real asReal() const
+ LLSD::Real asReal() const override
{
return mValue.secondsSinceEpoch();
}
- virtual LLSD::String asString() const{ return mValue.asString(); }
- virtual LLSD::Date asDate() const { return mValue; }
+
+ LLSD::String asString() const override { return mValue.asString(); }
+ LLSD::Date asDate() const override { return mValue; }
};
- class ImplURI
+ class ImplURI final
: public ImplBase
{
public:
ImplURI(const LLSD::URI& v) : Base(v) { }
- virtual LLSD::String asString() const{ return mValue.asString(); }
- virtual LLSD::URI asURI() const { return mValue; }
+ LLSD::String asString() const override { return mValue.asString(); }
+ LLSD::URI asURI() const override { return mValue; }
};
- class ImplBinary
+ class ImplBinary final
: public ImplBase
{
public:
ImplBinary(const LLSD::Binary& v) : Base(v) { }
- virtual const LLSD::Binary& asBinary() const{ return mValue; }
+ const LLSD::Binary& asBinary() const override { return mValue; }
};
- class ImplMap : public LLSD::Impl
+ class ImplMap final : public LLSD::Impl
{
private:
typedef std::map DataMap;
@@ -372,31 +374,31 @@ namespace
public:
ImplMap() { }
- virtual ImplMap& makeMap(LLSD::Impl*&);
+ ImplMap& makeMap(LLSD::Impl*&) override;
- virtual LLSD::Type type() const { return LLSD::TypeMap; }
+ LLSD::Type type() const override { return LLSD::TypeMap; }
- virtual LLSD::Boolean asBoolean() const { return !mData.empty(); }
+ LLSD::Boolean asBoolean() const override { return !mData.empty(); }
- virtual bool has(const LLSD::String&) const;
+ bool has(const LLSD::String&) const override;
using LLSD::Impl::get; // Unhiding get(LLSD::Integer)
using LLSD::Impl::erase; // Unhiding erase(LLSD::Integer)
using LLSD::Impl::ref; // Unhiding ref(LLSD::Integer)
- virtual LLSD get(const LLSD::String&) const;
- virtual LLSD getKeys() const;
+ LLSD get(const LLSD::String&) const override;
+ LLSD getKeys() const override;
void insert(const LLSD::String& k, const LLSD& v);
- virtual void erase(const LLSD::String&);
+ void erase(const LLSD::String&) override;
LLSD& ref(const LLSD::String&);
- virtual const LLSD& ref(const LLSD::String&) const;
+ const LLSD& ref(const LLSD::String&) const override;
- virtual int size() const { return mData.size(); }
+ int size() const override { return mData.size(); }
DataMap& map() final override { return mData; }
const DataMap& map() const final override { return mData; }
- virtual void dumpStats() const;
- virtual void calcStats(S32 type_counts[], S32 share_counts[]) const;
+ void dumpStats() const override;
+ void calcStats(S32 type_counts[], S32 share_counts[]) const override;
};
ImplMap& ImplMap::makeMap(LLSD::Impl*& var)
@@ -483,7 +485,7 @@ namespace
{
//std::cout << " " << (*iter).first << ": " << (*iter).second << std::endl;
Impl::calcStats((*iter).second, type_counts, share_counts);
- iter++;
+ ++iter;
}
// Add in the values for this map
@@ -491,7 +493,7 @@ namespace
}
- class ImplArray : public LLSD::Impl
+ class ImplArray final : public LLSD::Impl
{
private:
typedef std::vector DataVector;
@@ -504,28 +506,28 @@ namespace
public:
ImplArray() { }
- virtual ImplArray& makeArray(Impl*&);
+ ImplArray& makeArray(Impl*&) override;
- virtual LLSD::Type type() const { return LLSD::TypeArray; }
+ LLSD::Type type() const override { return LLSD::TypeArray; }
- virtual LLSD::Boolean asBoolean() const { return !mData.empty(); }
+ LLSD::Boolean asBoolean() const override { return !mData.empty(); }
using LLSD::Impl::get; // Unhiding get(LLSD::String)
using LLSD::Impl::erase; // Unhiding erase(LLSD::String)
using LLSD::Impl::ref; // Unhiding ref(LLSD::String)
- virtual int size() const;
- virtual LLSD get(LLSD::Integer) const;
+ int size() const override;
+ LLSD get(LLSD::Integer) const override;
void set(LLSD::Integer, const LLSD&);
void insert(LLSD::Integer, const LLSD&);
LLSD& append(const LLSD&);
- virtual void erase(LLSD::Integer);
+ void erase(LLSD::Integer) override;
LLSD& ref(LLSD::Integer);
- virtual const LLSD& ref(LLSD::Integer) const;
+ const LLSD& ref(LLSD::Integer) const override;
DataVector& array() final override { return mData; }
const DataVector& array() const final override { return mData; }
- virtual void calcStats(S32 type_counts[], S32 share_counts[]) const;
+ void calcStats(S32 type_counts[], S32 share_counts[]) const override;
};
ImplArray& ImplArray::makeArray(Impl*& var)
@@ -629,7 +631,7 @@ namespace
while (iter != endArray())
{ // Add values for all items held in the array
Impl::calcStats((*iter), type_counts, share_counts);
- iter++;
+ ++iter;
}
// Add in the values for this array
@@ -701,7 +703,7 @@ void LLSD::Impl::assign(Impl*& var, const Impl* other)
void LLSD::Impl::assignUndefined(Impl*& var)
{
- reset(var, 0);
+ reset(var, nullptr);
}
void LLSD::Impl::assign(Impl*& var, LLSD::Boolean v)
@@ -777,7 +779,7 @@ void LLSD::Impl::calcStats(S32 type_counts[], S32 share_counts[]) const
S32 tp = S32(type());
if (0 <= tp && tp < LLSD::TypeLLSDNumTypes)
{
- type_counts[tp]++;
+ type_counts[tp]++;
if (shared())
{
share_counts[tp]++;
@@ -811,10 +813,10 @@ namespace
}
-LLSD::LLSD() : impl(0) { ALLOC_LLSD_OBJECT; }
-LLSD::~LLSD() { FREE_LLSD_OBJECT; Impl::reset(impl, 0); }
+LLSD::LLSD() : impl(nullptr) { ALLOC_LLSD_OBJECT; }
+LLSD::~LLSD() { FREE_LLSD_OBJECT; Impl::reset(impl, nullptr); }
-LLSD::LLSD(const LLSD& other) : impl(0) { ALLOC_LLSD_OBJECT; assign(other); }
+LLSD::LLSD(const LLSD& other) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(other); }
void LLSD::assign(const LLSD& other) { Impl::assign(impl, other.impl); }
@@ -823,17 +825,17 @@ void LLSD::clear() { Impl::assignUndefined(impl); }
LLSD::Type LLSD::type() const { return safe(impl).type(); }
// Scalar Constructors
-LLSD::LLSD(Boolean v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
-LLSD::LLSD(Integer v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
-LLSD::LLSD(Real v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
-LLSD::LLSD(const UUID& v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
-LLSD::LLSD(const String& v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
-LLSD::LLSD(const Date& v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
-LLSD::LLSD(const URI& v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
-LLSD::LLSD(const Binary& v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(Boolean v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(Integer v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(Real v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(const UUID& v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(const String& v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(const Date& v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(const URI& v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(const Binary& v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
// Convenience Constructors
-LLSD::LLSD(F32 v) : impl(0) { ALLOC_LLSD_OBJECT; assign((Real)v); }
+LLSD::LLSD(F32 v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign((Real)v); }
// Scalar Assignment
void LLSD::assign(Boolean v) { safe(impl).assign(impl, v); }
@@ -858,7 +860,7 @@ const LLSD::Binary& LLSD::asBinary() const { return safe(impl).asBinary(); }
const LLSD::String& LLSD::asStringRef() const { return safe(impl).asStringRef(); }
// const char * helpers
-LLSD::LLSD(const char* v) : impl(0) { ALLOC_LLSD_OBJECT; assign(v); }
+LLSD::LLSD(const char* v) : impl(nullptr) { ALLOC_LLSD_OBJECT; assign(v); }
void LLSD::assign(const char* v)
{
if(v) assign(std::string(v));
@@ -925,7 +927,7 @@ static const char *llsd_dump(const LLSD &llsd, bool useXMLFormat)
// sStorage will point to the result of the last call. This will actually
// be one leak, but since this is used only when running under the
// debugger, it should not be an issue.
- static char *sStorage = NULL;
+ static char *sStorage = nullptr;
delete[] sStorage;
std::string out_string;
{
diff --git a/indra/llcommon/llsd.h b/indra/llcommon/llsd.h
index e6c34e32b..1d8950bfc 100644
--- a/indra/llcommon/llsd.h
+++ b/indra/llcommon/llsd.h
@@ -389,9 +389,9 @@ public:
using an arbitrary pointer or scalar type to std::string.
*/
//@{
- LLSD(const void*); ///< construct from aribrary pointers
- void assign(const void*); ///< assign from arbitrary pointers
- LLSD& operator=(const void*); ///< assign from arbitrary pointers
+ LLSD(const void*) = delete; ///< construct from aribrary pointers
+ void assign(const void*) = delete; ///< assign from arbitrary pointers
+ LLSD& operator=(const void*) = delete; ///< assign from arbitrary pointers
bool has(Integer) const; ///< has() only works for Maps
//@}
diff --git a/indra/llcommon/llsdjson.cpp b/indra/llcommon/llsdjson.cpp
index db89b293e..a31128dd8 100644
--- a/indra/llcommon/llsdjson.cpp
+++ b/indra/llcommon/llsdjson.cpp
@@ -79,6 +79,17 @@ LLSD LlsdFromJson(const nlohmann::json &val)
return result;
}
+LLSD LlsdFromJsonString(const std::string& str)
+{
+ auto json = nlohmann::json::parse(str, nullptr, false);
+ if (json.is_discarded())
+ {
+ LL_WARNS() << "Cannot parse invalid json string:\n" << str << LL_ENDL;
+ return LLSD();
+ }
+ return LlsdFromJson(json);
+}
+
//=========================================================================
nlohmann::json LlsdToJson(const LLSD &val)
{
diff --git a/indra/llcommon/llsdjson.h b/indra/llcommon/llsdjson.h
index bc76acbc8..5c45f697e 100644
--- a/indra/llcommon/llsdjson.h
+++ b/indra/llcommon/llsdjson.h
@@ -54,6 +54,7 @@
/// For maps and arrays child entries will be converted and added to the structure.
/// Order is preserved for an array but not for objects.
LLSD LlsdFromJson(const nlohmann::json &val);
+LLSD LlsdFromJsonString(const std::string& body);
/// Convert an LLSD object into Parsed JSON object maintaining member names and
/// array indexs.
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index f8690f63b..3f85810ee 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -118,7 +118,7 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
fail_if_not_legacy = true;
}
- if (!strncasecmp(LEGACY_NON_HEADER, hdr_buf, strlen(LEGACY_NON_HEADER))) /* Flawfinder: ignore */
+ if (!strnicmp(LEGACY_NON_HEADER, hdr_buf, strlen(LEGACY_NON_HEADER))) /* Flawfinder: ignore */
{
legacy_no_header = true;
inbuf = (int)str.gcount();
@@ -141,9 +141,8 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
}
header = hdr_buf;
- std::string::size_type start = std::string::npos;
+ std::string::size_type start = header.find_first_not_of("& buffer = data.asBinary();
ostr << "b(" << buffer.size() << ")\"";
- if(buffer.size())
+ if(!buffer.empty())
{
if (options & LLSDFormatter::OPTIONS_PRETTY_BINARY)
{
std::ios_base::fmtflags old_flags = ostr.flags();
ostr.setf( std::ios::hex, std::ios::basefield );
ostr << "0x";
- for (size_t i = 0; i < buffer.size(); i++)
+ for (unsigned char i : buffer)
{
- ostr << (int) buffer[i];
+ ostr << static_cast(i);
}
ostr.flags(old_flags);
}
else
{
- ostr.write((const char*)&buffer[0], buffer.size());
+ ostr.write(reinterpret_cast(&buffer[0]), buffer.size());
}
}
ostr << "\"";
@@ -1442,9 +1441,9 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
{
ostr.put('{');
U32 size_nbo = htonl(data.size());
- ostr.write((const char*)(&size_nbo), sizeof(U32));
- LLSD::map_const_iterator iter = data.beginMap();
- LLSD::map_const_iterator end = data.endMap();
+ ostr.write(reinterpret_cast(&size_nbo), sizeof(U32));
+ auto iter = data.beginMap();
+ auto end = data.endMap();
for(; iter != end; ++iter)
{
ostr.put('k');
@@ -1459,7 +1458,7 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
{
ostr.put('[');
U32 size_nbo = htonl(data.size());
- ostr.write((const char*)(&size_nbo), sizeof(U32));
+ ostr.write(reinterpret_cast(&size_nbo), sizeof(U32));
for (const auto& entry : data.array())
{
format_count += format(entry, ostr);
@@ -1525,7 +1524,7 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
const std::vector& buffer = data.asBinary();
U32 size_nbo = htonl(buffer.size());
ostr.write((const char*)(&size_nbo), sizeof(U32));
- if(buffer.size()) ostr.write((const char*)&buffer[0], buffer.size());
+ if(!buffer.empty()) ostr.write((const char*)&buffer[0], buffer.size());
break;
}
@@ -1702,12 +1701,12 @@ int deserialize_string_raw(
// *FIX: This is memory inefficient.
S32 len = strtol(buf + 1, NULL, 0);
if((max_bytes>0)&&(len>max_bytes)) return LLSDParser::PARSE_FAILURE;
- std::vector buf;
+ std::vector buf2;
if(len)
{
- buf.resize(len);
- count += (int)fullread(istr, (char *)&buf[0], len);
- value.assign(buf.begin(), buf.end());
+ buf2.resize(len);
+ count += (int)fullread(istr, (char *)&buf2[0], len);
+ value.assign(buf2.begin(), buf2.end());
}
c = istr.get();
++count;
@@ -2091,7 +2090,18 @@ std::string zip_llsd(LLSD& data)
}
have = CHUNK-strm.avail_out;
- output = (U8*) realloc(output, cur_size+have);
+ U8* new_output = (U8*) realloc(output, cur_size+have);
+ if (new_output == NULL)
+ {
+ LL_WARNS() << "Failed to compress LLSD block: can't reallocate memory, current size: " << cur_size << " bytes; requested " << cur_size + have << " bytes." << LL_ENDL;
+ deflateEnd(&strm);
+ if (output)
+ {
+ free(output);
+ }
+ return std::string();
+ }
+ output = new_output;
memcpy(output+cur_size, out, have);
cur_size += have;
}
@@ -2110,15 +2120,6 @@ std::string zip_llsd(LLSD& data)
deflateEnd(&strm);
free(output);
-#if 0 //verify results work with unzip_llsd
- std::istringstream test(result);
- LLSD test_sd;
- if (!unzip_llsd(test_sd, test, result.size()))
- {
- LL_ERRS() << "Invalid compression result!" << LL_ENDL;
- }
-#endif
-
return result;
}
@@ -2169,7 +2170,19 @@ bool unzip_llsd(LLSD& data, std::istream& is, S32 size)
U32 have = CHUNK-strm.avail_out;
- result = (U8*) realloc(result, cur_size + have);
+ U8* new_result = (U8*)realloc(result, cur_size + have);
+ if (new_result == NULL)
+ {
+ LL_WARNS() << "Failed to unzip LLSD block: can't reallocate memory, current size: " << cur_size << " bytes; requested " << cur_size + have << " bytes." << LL_ENDL;
+ inflateEnd(&strm);
+ if (result)
+ {
+ free(result);
+ }
+ delete in;
+ return false;
+ }
+ result = new_result;
memcpy(result+cur_size, out, have);
cur_size += have;
@@ -2215,6 +2228,11 @@ bool unzip_llsd(LLSD& data, std::istream& is, S32 size)
//and trailers are different for the formats.
U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize, std::istream& is, S32 size )
{
+ if (size == 0)
+ {
+ LL_WARNS() << "No data to unzip." << LL_ENDL;
+ return NULL;
+ }
U8* result = NULL;
U32 cur_size = 0;
z_stream strm;
@@ -2254,7 +2272,23 @@ U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize, std::istream& is, S32
}
U32 have = CHUNK-strm.avail_out;
- result = (U8*) realloc(result, cur_size + have);
+ U8* new_result = (U8*) realloc(result, cur_size + have);
+ if (new_result == NULL)
+ {
+ LL_WARNS() << "Failed to unzip LLSD NavMesh block: can't reallocate memory, current size: " << cur_size
+ << " bytes; requested " << cur_size + have
+ << " bytes; total syze: ." << size << " bytes."
+ << LL_ENDL;
+ inflateEnd(&strm);
+ if (result)
+ {
+ free(result);
+ }
+ delete [] in;
+ valid = false;
+ return NULL;
+ }
+ result = new_result;
memcpy(result+cur_size, out, have);
cur_size += have;
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 86992aee6..e14ae9027 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1165,8 +1165,10 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd, bool is_new)
// mType, these are the two asset types that are IT_WEARABLE:
static U32 AT_BODYPART = 13; // LLAssetType::AT_BODYPART
// Viewer local values:
- static U32 WT_UNKNOWN = 16; // LLWearableType::WT_UNKNOWN
- static U32 WT_COUNT = 17; // LLWearableType::WT_COUNT
+ static U32 WT_UNKNOWN = 17; // LLWearableType::WT_UNKNOWN
+ static U32 WT_COUNT = 18; // LLWearableType::WT_COUNT
+ // Keep WT_UNKNOWN and WT_COUNT
+ // in sync with llwearabletype.h
// The last 8 bits of mFlags contain the wearable type.
static U32 II_FLAGS_SUBTYPE_MASK = 0xff; // LLInventoryItemFlags::II_FLAGS_SUBTYPE_MASK
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index a4aaae365..158c2edc5 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -40,6 +40,8 @@
#include "llsdutil_math.h"
#include "message.h"
#include "u64.h"
+#include "llregionflags.h"
+#include
static const F32 SOME_BIG_NUMBER = 1000.0f;
static const F32 SOME_BIG_NEG_NUMBER = -1000.0f;
@@ -742,8 +744,8 @@ void LLParcel::unpackMessage(LLMessageSystem* msg)
void LLParcel::packAccessEntries(LLMessageSystem* msg,
const std::map& list)
{
- access_map_const_iterator cit = list.begin();
- access_map_const_iterator end = list.end();
+ LLAccessEntry::map::const_iterator cit = list.begin();
+ LLAccessEntry::map::const_iterator end = list.end();
if (cit == end)
{
@@ -794,9 +796,28 @@ void LLParcel::unpackAccessEntries(LLMessageSystem* msg,
}
+void LLParcel::unpackExperienceEntries(LLMessageSystem* msg, U32 type)
+{
+ LLUUID id;
+
+ S32 i;
+ S32 count = msg->getNumberOfBlocksFast(_PREHASH_List);
+ for (i = 0; i < count; i++)
+ {
+ msg->getUUIDFast(_PREHASH_List, _PREHASH_ID, id, i);
+
+ if (id.notNull())
+ {
+ mExperienceKeys[id] = type;
+ }
+ }
+}
+
+
+
void LLParcel::expirePasses(S32 now)
{
- access_map_iterator itor = mAccessList.begin();
+ LLAccessEntry::map::iterator itor = mAccessList.begin();
while (itor != mAccessList.end())
{
const LLAccessEntry& entry = (*itor).second;
@@ -886,7 +907,7 @@ BOOL LLParcel::addToAccessList(const LLUUID& agent_id, S32 time)
// Can't add owner to these lists
return FALSE;
}
- access_map_iterator itor = mAccessList.begin();
+ LLAccessEntry::map::iterator itor = mAccessList.begin();
while (itor != mAccessList.end())
{
const LLAccessEntry& entry = (*itor).second;
@@ -931,7 +952,7 @@ BOOL LLParcel::addToBanList(const LLUUID& agent_id, S32 time)
return FALSE;
}
- access_map_iterator itor = mBanList.begin();
+ LLAccessEntry::map::iterator itor = mBanList.begin();
while (itor != mBanList.end())
{
const LLAccessEntry& entry = (*itor).second;
@@ -970,7 +991,7 @@ BOOL remove_from_access_array(std::map* list,
const LLUUID& agent_id)
{
BOOL removed = FALSE;
- access_map_iterator itor = list->begin();
+ LLAccessEntry::map::iterator itor = list->begin();
while (itor != list->end())
{
const LLAccessEntry& entry = (*itor).second;
@@ -1091,7 +1112,7 @@ void LLParcel::startSale(const LLUUID& buyer_id, BOOL is_buyer_group)
mSaleTimerExpires.start();
mSaleTimerExpires.setTimerExpirySec(U64Microseconds(DEFAULT_USEC_SALE_TIMEOUT));
mStatus = OS_LEASE_PENDING;
- mClaimDate = time(NULL);
+ mClaimDate = time(nullptr);
setAuctionID(0);
// clear the autoreturn whenever land changes hands
setCleanOtherTime(0);
@@ -1313,3 +1334,58 @@ LLParcel::ECategory category_ui_string_to_category(const std::string& s)
// is a distinct option from "None" and "Other"
return LLParcel::C_ANY;
}
+
+LLAccessEntry::map LLParcel::getExperienceKeysByType(U32 type) const
+{
+ LLAccessEntry::map access;
+ LLAccessEntry entry;
+ xp_type_map_t::const_iterator it = mExperienceKeys.begin();
+ for(/**/; it != mExperienceKeys.end(); ++it)
+ {
+ if(it->second == type)
+ {
+ entry.mID = it->first;
+ access[entry.mID] = entry;
+ }
+ }
+ return access;
+}
+
+void LLParcel::clearExperienceKeysByType(U32 type)
+{
+ xp_type_map_t::iterator it = mExperienceKeys.begin();
+ while(it != mExperienceKeys.end())
+ {
+ if(it->second == type)
+ {
+ mExperienceKeys.erase(it++);
+ }
+ else
+ {
+ ++it;
+ }
+ }
+}
+
+void LLParcel::setExperienceKeyType(const LLUUID& experience_key, U32 type)
+{
+ if (type == EXPERIENCE_KEY_TYPE_NONE)
+ {
+ mExperienceKeys.erase(experience_key);
+ }
+ else
+ {
+ if (countExperienceKeyType(type) < PARCEL_MAX_EXPERIENCE_LIST)
+ {
+ mExperienceKeys[experience_key] = type;
+ }
+ }
+}
+
+U32 LLParcel::countExperienceKeyType(U32 type)
+{
+ return std::count_if(
+ boost::begin(mExperienceKeys | boost::adaptors::map_values),
+ boost::end(mExperienceKeys | boost::adaptors::map_values),
+ std::bind2nd(std::equal_to(), type));
+}
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index e91f9a320..c1322c387 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -60,6 +60,9 @@ const S32 PARCEL_MAX_ACCESS_LIST = 300;
//for access/ban lists.
const F32 PARCEL_MAX_ENTRIES_PER_PACKET = 48.f;
+// Maximum number of experiences
+const S32 PARCEL_MAX_EXPERIENCE_LIST = 24;
+
// Weekly charge for listing a parcel in the directory
const S32 PARCEL_DIRECTORY_FEE = 30;
@@ -141,9 +144,11 @@ class LLSD;
class LLAccessEntry
{
public:
+
+ typedef std::map map;
+
LLAccessEntry()
- : mID(),
- mTime(0),
+ : mTime(0),
mFlags(0)
{}
@@ -152,8 +157,6 @@ public:
U32 mFlags; // Not used - currently should always be zero
};
-typedef std::map::iterator access_map_iterator;
-typedef std::map::const_iterator access_map_const_iterator;
class LLParcel
{
@@ -331,6 +334,9 @@ public:
void unpackAccessEntries(LLMessageSystem* msg,
std::map* list);
+ void unpackExperienceEntries(LLMessageSystem* msg, U32 type);
+
+
void setAABBMin(const LLVector3& min) { mAABBMin = min; }
void setAABBMax(const LLVector3& max) { mAABBMax = max; }
@@ -707,6 +713,17 @@ public:
std::map mTempBanList;
std::map mTempAccessList;
+ typedef std::map xp_type_map_t;
+
+ void setExperienceKeyType(const LLUUID& experience_key, U32 type);
+ U32 countExperienceKeyType(U32 type);
+ U32 getExperienceKeyType(const LLUUID& experience_key)const;
+ LLAccessEntry::map getExperienceKeysByType(U32 type)const;
+ void clearExperienceKeysByType(U32 type);
+
+private:
+ xp_type_map_t mExperienceKeys;
+
};
diff --git a/indra/llinventory/llparcelflags.h b/indra/llinventory/llparcelflags.h
index 9d4884e32..fbfc2af1d 100644
--- a/indra/llinventory/llparcelflags.h
+++ b/indra/llinventory/llparcelflags.h
@@ -1,31 +1,25 @@
/**
* @file llparcelflags.h
*
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- *
- * Copyright (c) 2002-2009, Linden Research, Inc.
- *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
* Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab. Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
*
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
*
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -97,8 +91,10 @@ const U32 PF_DEFAULT = PF_ALLOW_FLY
| PF_USE_ESTATE_VOICE_CHAN;
// Access list flags
-const U32 AL_ACCESS = (1 << 0);
-const U32 AL_BAN = (1 << 1);
+const U32 AL_ACCESS = (1 << 0);
+const U32 AL_BAN = (1 << 1);
+const U32 AL_ALLOW_EXPERIENCE = (1 << 3);
+const U32 AL_BLOCK_EXPERIENCE = (1 << 4);
//const U32 AL_RENTER = (1 << 2);
// Block access return values. BA_ALLOWED is the only success case
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 2f843490d..67a7c997e 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -704,7 +704,7 @@ public:
#endif
}
- notifyRemoval(data);
+ this->notifyRemoval(data);
checkAlive();
}
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index c131b436c..b5f5bafc1 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -45,6 +45,7 @@ set(llmessage_SOURCE_FILES
llclassifiedflags.cpp
lldatapacker.cpp
lldispatcher.cpp
+ llexperiencecache.cpp
llfiltersd2xmlrpc.cpp
llhost.cpp
llhttpclient.cpp
@@ -133,11 +134,13 @@ set(llmessage_HEADER_FILES
llcipher.h
llcircuit.h
llclassifiedflags.h
+ llcororesponder.h
llcurl.h
lldatapacker.h
lldbstrings.h
lldispatcher.h
lleventflags.h
+ llexperiencecache.h
llfiltersd2xmlrpc.h
llfollowcamparams.h
llhost.h
@@ -227,7 +230,8 @@ target_link_libraries(
${OPENSSL_LIBRARIES}
${CRYPTO_LIBRARIES}
${XMLRPCEPI_LIBRARIES}
- )
+ ${PTHREAD_LIBRARY}
+)
# tests
if (LL_TESTS)
diff --git a/indra/llmessage/llavatarname.cpp b/indra/llmessage/llavatarname.cpp
index fdcfed161..a02d7c012 100644
--- a/indra/llmessage/llavatarname.cpp
+++ b/indra/llmessage/llavatarname.cpp
@@ -139,7 +139,7 @@ void LLAvatarName::fromString(const std::string& full_name)
mLegacyLastName = full_name.substr(index+1);
if (mLegacyLastName != "Resident")
{
- mUsername = mLegacyFirstName + "." + mLegacyLastName;
+ mUsername = mLegacyFirstName + '.' + mLegacyLastName;
mDisplayName = full_name;
LLStringUtil::toLower(mUsername);
}
@@ -184,7 +184,7 @@ std::string LLAvatarName::getCompleteName(bool linefeed) const
name = mDisplayName;
if (sUseUsernames)
{
- name += (linefeed ? "\n(" : " (") + mUsername + ")";
+ name += (linefeed ? "\n(" : " (") + mUsername + ')';
}
}
}
@@ -238,7 +238,7 @@ std::string LLAvatarName::getUserName() const
}
else
{
- name = mLegacyFirstName + " " + mLegacyLastName;
+ name = mLegacyFirstName + ' ' + mLegacyLastName;
}
return name;
}
diff --git a/indra/llmessage/llavatarname.h b/indra/llmessage/llavatarname.h
index 5902d34d8..4f0df57cc 100644
--- a/indra/llmessage/llavatarname.h
+++ b/indra/llmessage/llavatarname.h
@@ -94,7 +94,7 @@ public:
{
case 1 : return getCompleteName();
case 2 : return getDisplayName();
- case 3 : return getLegacyName() + (mIsDisplayNameDefault ? "" : " (" + mDisplayName + ")"); break;
+ case 3 : return getLegacyName() + (mIsDisplayNameDefault ? "" : " (" + mDisplayName + ')'); break;
default : return getLegacyName();
}
}
diff --git a/indra/llmessage/llcororesponder.h b/indra/llmessage/llcororesponder.h
new file mode 100644
index 000000000..bacec85a8
--- /dev/null
+++ b/indra/llmessage/llcororesponder.h
@@ -0,0 +1,63 @@
+/**
+ * @file llcororesponder.h
+ * @brief A responder purposed to call coro functions, to ease transition to LLCoro
+ *
+ * $LicenseInfo:firstyear=2006&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ *
+ * Copyright (C) 2020, Liru Færs
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#include
+#include "llhttpclient.h"
+
+struct LLCoroResponderBase : public LLHTTPClient::ResponderWithCompleted
+{
+ const AIHTTPReceivedHeaders& getHeaders() const { return mReceivedHeaders; }
+ const LLSD& getContent() const { return mContent; }
+
+ char const* getName() const override final { return "LLCoroResponder"; }
+protected:
+ LLCoroResponderBase() {}
+};
+
+struct LLCoroResponder final : public LLCoroResponderBase
+{
+ typedef std::function cb_t;
+ LLCoroResponder(const cb_t& cb) : mCB(cb) {}
+ void httpCompleted() override { mCB(*this); }
+private:
+ const cb_t mCB;
+};
+
+struct LLCoroResponderRaw final : public LLCoroResponderBase
+{
+ typedef std::function cb_t;
+ LLCoroResponderRaw(const cb_t& cb) : mCB(cb) {}
+ void completedRaw(const LLChannelDescriptors& channels, const buffer_ptr_t& buffer) override
+ {
+ std::string content;
+ decode_raw_body(channels, buffer, content);
+ mCB(*this, content);
+ }
+private:
+ const cb_t mCB;
+};
+
diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp
new file mode 100644
index 000000000..482b87091
--- /dev/null
+++ b/indra/llmessage/llexperiencecache.cpp
@@ -0,0 +1,921 @@
+/**
+ * @file llexperiencecache.cpp
+ * @brief llexperiencecache and related class definitions
+ *
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2012, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+#include "llexperiencecache.h"
+
+#include "llavatarname.h"
+#include "llcororesponder.h"
+#include "llsdserialize.h"
+#include "lleventfilter.h"
+#include "lldir.h"
+#include
+#include
diff --git a/indra/newview/app_settings/mime_types.xml b/indra/newview/app_settings/mime_types.xml
index 0f78823b3..9182f5742 100644
--- a/indra/newview/app_settings/mime_types.xml
+++ b/indra/newview/app_settings/mime_types.xml
@@ -133,6 +133,17 @@
media_plugin_libvlc
+
+
+
+ movie
+
+
+ media_plugin_example
+
+