Update FMOD

- Many instances of null-checking if statements include both variable declaration and initialization (for scoping)
- Modern(ish) C++ conventions (e.g. range-based for loops, auto keyword)
- Local variable caching for array/iterator elements
- const keyword for variables that should not be mutated (optimization possible)
- const keyword for instance methods that should not mutate (affects LLModelLoader in one case)
- Consistent usage of un/signed types for array indexing
- Better readability/simplicity of branching
- Consolidated extractTranslation/ViaElement logic (reusability)
- Formatting
- Changes based on code review

.gitattributes

@@ -1 +0,0 @@
-* text=auto

.gitignore

@@ -1,24 +1,25 @@
-/installed.xml
-/indra/llcommon/llversionviewer.h
 /indra/build-*
 /indra/tools/vstool/obj/
 *.aps
 *.suo
 *.vshost.exe
+*/.vs
 /bin/
 /bin-release/
 /bin
 /bin-release
+/indra/out/
 /indra/viewer-*
 /indra/newview/vivox-runtime/
 /indra/newview/dbghelp.dll
+indra/newview/res/viewer_icon.*
+indra/newview/res-sdl/viewer_icon.*
 /libraries/
 /lib/
 *.pyc
 *.orig
 *.rej
 *.bak
-*~
 *.DS_Store
 /LICENSES/
 /edited-files.txt
@@ -26,3 +27,4 @@ qtcreator-build/
 /.pc
 /build-*
 /viewer-*
+/Pipfile.lock

.gitlab-ci.yml

@@ -0,0 +1,286 @@
+stages:
+  - build
+  - upload
+
+default:
+  interruptible: true
+  timeout: 4h
+
+variables:
+  AUTOBUILD_BUILD_ID: $CI_PIPELINE_ID
+  AUTOBUILD_INSTALLABLE_CACHE: "$CI_PROJECT_DIR/.cache/autobuild"
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  VIEWER_USE_CRASHPAD: "TRUE"
+  VIEWER_CRASHPAD_URL: $SENTRY_DSN
+
+.win_build:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  cache:
+    key:
+      files:
+        - autobuild.xml
+      prefix: ${CI_JOB_NAME}
+    paths:
+      - .cache/autobuild
+      - .cache/pip
+      - .venv/
+    when: 'always'
+  before_script:
+    - virtualenv .venv
+    - .\.venv\Scripts\activate.ps1
+    - pip install --upgrade autobuild -i https://pkg.alchemyviewer.org/repository/autobuild/simple --extra-index-url https://pypi.org/simple
+  script:
+    - |
+        autobuild configure -c Release -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
+        autobuild build -c Release --no-configure
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 1 week
+    paths:
+      - build-vc-*/newview/Release/build_data.json
+      - build-vc-*/newview/Release/singularity-bin.exe
+      - build-vc-*/newview/Release/*.pdb
+      - build-vc-*/newview/Release/*.dll
+      - build-vc-*/newview/Release/Singularity_*_Setup.exe
+
+.linux_build:
+  stage: build
+  image: r.alchemyviewer.org/singularity/infrastructure/debian-build-image:latest
+  tags:
+    - linux
+    - docker
+  cache:
+    key:
+      files:
+        - autobuild.xml
+      prefix: ${CI_JOB_NAME}
+    paths:
+      - .cache/autobuild
+      - .cache/pip
+      - .venv
+    when: 'always'
+  before_script:
+    - virtualenv .venv -p python2
+    - source .venv/bin/activate
+    - pip install --upgrade autobuild -i https://pkg.alchemyviewer.org/repository/autobuild/simple --extra-index-url https://pypi.org/simple
+  script:
+    - |
+        autobuild configure -c Release -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DUNIX_DISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
+        autobuild build -c Release --no-configure
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 1 week
+    paths:
+      - build-linux-*/build_data.json
+      - build-linux-*/newview/Singularity_*.tar.xz
+
+.win32_build:
+  extends: .win_build
+  variables:
+    AUTOBUILD_ADDRSIZE: 32
+    VIEWER_USE_CRASHPAD: "FALSE"
+  cache:
+    key:
+      prefix: windows32
+
+.win64_build:
+  extends: .win_build
+  variables:
+    AUTOBUILD_ADDRSIZE: 64
+  cache:
+    key:
+      prefix: windows64
+
+.linux32_build:
+  extends: .linux_build
+  variables:
+    AUTOBUILD_ADDRSIZE: 32
+  cache:
+    key:
+      prefix: linux32
+
+.linux64_build:
+  extends: .linux_build
+  variables:
+    AUTOBUILD_ADDRSIZE: 64
+  cache:
+    key:
+      prefix: linux64
+
+.master_rules:
+  rules:
+    - if: $BUILD_CHANNEL || $CI_COMMIT_TAG
+      when: never
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+    #- if: '$CI_COMMIT_BRANCH == "master" && $CI_PIPELINE_SOURCE == "push"'
+    #  when: delayed
+    #  start_in: '12 hours'
+  variables:
+    VIEWER_CHANNEL_TYPE: Test
+    VIEWER_USE_CRASHPAD: "FALSE"
+
+.project_rules:
+  rules:
+    - if: '$BUILD_CHANNEL == "Project" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
+    - if: '$CI_COMMIT_TAG =~ /.*-project/'
+  variables:
+    VIEWER_CHANNEL_TYPE: Project
+
+.beta_rules:
+  rules:
+    - if: '$BUILD_CHANNEL == "Beta" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
+    - if: '$CI_COMMIT_TAG =~ /.*-beta/'
+  variables:
+    VIEWER_CHANNEL_TYPE: Beta
+
+.release_rules:
+  rules:
+    - if: '$BUILD_CHANNEL == "Release" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
+    - if: '$CI_COMMIT_TAG =~ /.*-release/'
+  variables:
+    VIEWER_CHANNEL_TYPE: Release
+
+.build:master:linux64:
+  extends:
+    - .linux64_build
+    - .master_rules
+
+build:master:windows32:
+  extends:
+    - .win32_build
+    - .master_rules
+
+build:master:windows64:
+  extends:
+    - .win64_build
+    - .master_rules
+
+.build:project:linux64:
+  extends:
+    - .linux64_build
+    - .project_rules
+
+build:project:windows32:
+  extends:
+    - .win32_build
+    - .project_rules
+
+build:project:windows64:
+  extends:
+    - .win64_build
+    - .project_rules
+
+.build:beta:linux64:
+  extends:
+    - .linux64_build
+    - .beta_rules
+
+build:beta:windows32:
+  extends:
+    - .win32_build
+    - .beta_rules
+
+build:beta:windows64:
+  extends:
+    - .win64_build
+    - .beta_rules
+
+.build:release:linux64:
+  extends:
+    - .linux64_build
+    - .release_rules
+
+build:release:windows32:
+  extends:
+    - .win32_build
+    - .release_rules
+
+build:release:windows64:
+  extends:
+    - .win64_build
+    - .release_rules
+
+.upload_template:
+  stage: upload
+  tags:
+    - autobuild
+    - windows
+  allow_failure: false
+  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; };
+
+        Function try_upload($build_type, $file_pattern)
+        {
+          $build_newview = ".\build-${build_type}\newview\"
+          If (Test-Path -LiteralPath $build_newview)
+          {
+            Push-Location $build_newview
+              $FileName = Get-ChildItem -Path . -Name -Include $file_pattern
+              Invoke-WebRequest @UploadParams -InFile .\$FileName -Uri "${UploadDestURL}/${FileName}"
+
+              If (($env:VIEWER_USE_CRASHPAD -eq 'TRUE') -and ($build_type -eq "vc-64"))
+              {
+                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
+          }
+        }
+
+        try_upload("linux-64", "Singularity_*.tar.xz")
+        try_upload("vc-64", "Singularity_*_Setup.exe")
+        try_upload("vc-32", "Singularity_*_Setup.exe")
+
+        If ($env:VIEWER_USE_CRASHPAD -eq 'TRUE')
+        {
+          sentry-cli releases new $BuildChannelVersion
+          sentry-cli releases set-commits --auto $BuildChannelVersion
+          sentry-cli releases finalize $BuildChannelVersion
+        }
+
+upload:project:
+  extends:
+    - .upload_template
+  rules:
+    - if: '$BUILD_CHANNEL == "Project" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
+      when: manual
+    - if: '$CI_COMMIT_TAG =~ /.*-project/'
+      when: manual
+  environment:
+    name: qa
+
+upload:beta:
+  extends:
+    - .upload_template
+  rules:
+    - if: '$BUILD_CHANNEL == "Beta" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
+      when: manual
+    - if: '$CI_COMMIT_TAG =~ /.*-beta/'
+      when: manual
+  environment:
+    name: beta
+
+upload:release:
+  extends:
+    - .upload_template
+  rules:
+    - if: '$BUILD_CHANNEL == "Release" && ($CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule")'
+      when: manual
+    - if: '$CI_COMMIT_TAG =~ /.*-release/'
+      when: manual
+  environment:
+    name: release

AscentChangelog.txt

@@ -1,81 +0,0 @@
-->> Features implemented in Ascent:
-
-In-World:
--------------------------------------------------
-* Alpha skins and Tattoo Layers
-* Inventory Pre-caching
-* Avatar Radar
-* Multiple Attachment Points
-* Idle time of avatars around you (Not perfect)
-* Client tags/coloring for various clients, and extra client definitions
-* Force Away button to fake being away if you really want to avoid someone :V
-* Double-Click teleport (Not all the functionality of Emerald yet)
-Preferences (Options are in Ascent Options):
-* Disable Look At
-* Disable Point At and beam end
-* Fetch inventory in background on login (No waiting for caching when searching)
-* Display your client tag to yourself
-* Display your client tag color to yourself
-* Rez objects as land group when possible
-* Some settings can now be saved per account after changing an option in the preferences. Currently affected settings:
-	Edit Beam color
-	Client Tag Color
-Communication Window:
-- Friend List:
-  * Friend List Online/Total counts (Not perfect)
-  * Shows what rights your friends have given you (Mod, See on map, Online)
-
-Chat Bar:
-* Emerald-style Chatbar as Commandline (See Preferences)
-* MU-style poses.
-* OOC Auto-close.
-
-Instant Messages:
-* MU-style poses.
-* OOC Auto-close.
-
-Advanced -> Ascent:
-* Fake Away Status
-* Force Ground Sit (Lets you sit anywhere)
-* Phantom Avatar (Prevents you visually from being pushed.)
-* Toggle IM Notification (Ability to hide '%n is typing...' notification from being sent.)
-* Close All Dialogs
-* Message Log
-* Message Builder
-* Sound Explorer
-* Asset Blacklist
-* AO options
-
-Object Pie Menus:
-* Measure: Select on one object, then another, to get the exact distance between the two
-* Data: Reports prim rotation and position in a format usable in LSL scripts.
-* Script Counter
-
-Self Pie Menu:
-* Animation Explorer
-
-Agent Pie Menus:
-* Script Counter
-* Copy Agent UUID
-* Debug
-
-Parcel Window:
--------------------------------------------------
-- General tab:
-- Objects tab:
-  * In Sim/Online/Offline indicators for Parcel Object Owner listings (Online is currently wonky - This is an issue with SL, Emerald has the same problem.)
-
-Build Window:
--------------------------------------------------
-- General tab:
-  * Last Owner shown in Build "General" Tab
-  * Group object is set to has a "View" button to see the group's profile
-  * Copy Object Key button
-- Build Tab:
-  * Copy/Paste Position buttons
-  * Copy/Paste Size buttons
-  * Copy/Paste Rotation buttons
-  * Copy/Paste Primitive Parameters buttons
-
-Known issues:
-Online/Total counts in the friends list sometimes go haywire. Not often or by a large margin, but it happens.

LICENSES/LEGAL-intel_matrixlib.txt

@@ -0,0 +1,29 @@
+INTEL LICENSE AGREEMENT
+
+IMPORTANT - READ BEFORE COPYING OR USING. 
+Do not use or load this library and any associated materials (collectively, 
+the "Software") until you have read the following terms and conditions. By 
+loading or using the Software, you agree to the terms of this Agreement. If 
+you do not wish to so agree, do not use the Software.
+
+LICENSE:  Subject to the restrictions below, Intel Corporation ("Intel") 
+grants to you the permission to use, copy, distribute and prepare derivative 
+works of this Software for any purpose and without fee, provided, that 
+Intel's copyright notice appear in all copies of the Software files.
+The distribution of derivative works of the Software is also subject to the 
+following limitations:  you (i) are solely responsible to your customers for 
+any liability which may arise from the distribution, (ii) do not make any 
+statement that your product is "certified", or that its performance is 
+guaranteed, by Intel, and (iii) do not use Intel's name or trademarks to 
+market your product without written permission.
+
+EXCLUSION OF ALL WARRANTIES. The Software is provided "AS IS" without any 
+express or implies warranty of any kind including warranties of 
+merchantability, noninfringement, or fitness for a particular purpose.  
+Intel does not warrant or assume responsibility for the accuracy or 
+completeness of any information contained within the Software.
+As this Software is given free of charge, in no event shall Intel be liable 
+for any damages whatsoever arising out of the use of or inability to use the 
+Software, even if Intel has been adviced of the possibility of such damages. 
+Intel does not assume any responsibility for any errors which may appear in 
+this Software nor any responsibility to update it.

Pipfile

@@ -0,0 +1,14 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[dev-packages]
+
+[packages]
+llbase = "*"
+certifi = "*"
+autobuild = {git = "https://git.alchemyviewer.org/alchemy/autobuild.git"}
+
+[requires]
+python_version = "2.7"

README

@@ -18,7 +18,7 @@ as those based upon the OpenSim platform.
 Singularity is maintained by a small group of volunteers who can be contacted
 both, in-world (SingularityViewer group) as well as on IRC (#SingularityViewer
 @ FreeNode). Bug requests and features requests can be submitted through our
-Issue Tracker (http://code.google.com/p/singularity-viewer/issues/list or from
+Issue Tracker (http://links.singularityviewer.org/?to=issues or from
 the viewer menu: Help --> Bug Reporting --> Singularity Issue Tracker...)
 
 

doc/asset_urls.txt

@@ -1,5 +0,0 @@
-SLASSET_LIBS_WIN32=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/slviewer-win32-libs-oss-viewer-1.23.4.0.zip
-SLASSET_MD5=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/md5sums-oss-viewer-1.23.4.0.txt
-SLASSET_LIBS_DARWIN=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/slviewer-darwin-libs-oss-viewer-1.23.4.0.tar.gz
-SLASSET_ART=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/slviewer-artwork-oss-viewer-1.23.4.0.zip
-SLASSET_LIBS_LINUXI386=http://automated-builds-secondlife-com.s3.amazonaws.com/oss-viewer/export/slviewer-linux-libs-oss-viewer-1.23.4.0.tar.gz

doc/releasenotes-where.txt

@@ -1,5 +0,0 @@
-For full release notes, see:
-	http://wiki.secondlife.com/wiki/Release_Notes
-
-For a log of viewer changes, see:
-	doc/viewer-changes.txt

etc/message.xml

@@ -236,6 +236,14 @@
 					<boolean>false</boolean>
 				</map>
 
+				<key>ObjectAnimation</key>
+				<map>
+					<key>flavor</key>
+					<string>template</string>
+					<key>trusted-sender</key>
+					<boolean>false</boolean>
+				</map>
+
 				<key>AvatarAppearance</key>
 				<map>
 					<key>flavor</key>

indra/CMakeLists.txt

@@ -3,19 +3,7 @@
 # cmake_minimum_required should appear before any
 # other commands to guarantee full compatibility
 # with the version specified
-
-cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
-
-# Eventually the third-party support modules (cmake/*.cmake) should
-# know the full path to all libraries.  Until that happens we need
-# per-configuration link directory "libraries/<arch>/lib/debug" for
-# Debug and "libraries/<arch>/lib/release" for Release,
-# RelWithDebInfo, and MinSizeRel.  CMake 2.6 does not directly support
-# per-configuration link directory specification.  However, we can set
-# CMP0003 to OLD and link to one library (apr) on a per-configuration
-# basis to convince CMake to add the proper link directory.  This line
-# can be removed when we use full paths for all libraries.
-cmake_policy(SET CMP0003 OLD)
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 set(ROOT_PROJECT_NAME "Singularity" CACHE STRING
     "The root project/makefile/solution name. Defaults to Singularity.")
@@ -23,25 +11,20 @@ project(${ROOT_PROJECT_NAME})
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-include(Variables)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-# Load versions now.  Install locations need them.
-include(BuildVersion)
-
-include(UnixInstall)
-
-if (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release CACHE STRING
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
       "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
-endif (NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
+endif (NOT CMAKE_BUILD_TYPE)
 
-# Create a 'prepare' target in which to perform setup actions.  This
-# must be the first target created so other targets can depend on it.
-if(NOT STANDALONE)
-  # We prepare prebuilt binaries when not building standalone.
-  set(prepare_depends ${CMAKE_BINARY_DIR}/prepare/prebuilt)
-endif(NOT STANDALONE)
-add_custom_target(prepare DEPENDS ${prepare_depends})
+include(Variables)
+include(00-Common)
+include(BuildVersion)
+include(CTest)
+
+add_subdirectory(deps)
 
 add_subdirectory(cmake)
 add_subdirectory(${LIBS_OPEN_PREFIX}aistatemachine)
@@ -64,12 +47,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs)
 add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
 add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
 
-if(STANDALONE)
-  add_subdirectory(${LIBS_OPEN_PREFIX}llqtwebkit)
-endif(STANDALONE)
-
-#add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
-
 if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
   add_subdirectory(${LIBS_CLOSED_PREFIX}copy_win_scripts)
 endif (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
@@ -81,29 +58,12 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llui)
 # viewer plugins directory
 add_subdirectory(${LIBS_OPEN_PREFIX}plugins)
 
-# llplugin testbed code (is this the right way to include it?)
-#if (NOT LINUX)
-#  add_subdirectory(${VIEWER_PREFIX}test_apps/llplugintest)
-#endif (NOT LINUX)
-
 add_subdirectory(${VIEWER_PREFIX}newview/statemachine)
 add_subdirectory(${VIEWER_PREFIX}newview)
-add_dependencies(viewer secondlife-bin)
+add_dependencies(viewer ${VIEWER_BINARY_NAME})
 
-# The use_prebuilt_binary macro in cmake/Prebuilt.cmake records
-# packages in the PREBUILT property of the 'prepare' target.
-get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
 
-# Create a script to download the needed binaries.
-configure_file(${CMAKE_SOURCE_DIR}/cmake/DownloadPrebuilt.cmake.in
-               ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake @ONLY)
-
-# Drive the download script at build time.  Depend on 'install.xml'
-# to aqcuire new binaries when needed.
-add_custom_command(
-  COMMENT "Obtaining prebuilt binaries..."
-  OUTPUT ${CMAKE_BINARY_DIR}/prepare/prebuilt
-  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake
-  DEPENDS ${CMAKE_SOURCE_DIR}/../install.xml
-          ${CMAKE_BINARY_DIR}/DownloadPrebuilt.cmake
-  )
+if (WINDOWS)
+  set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    PROPERTY VS_STARTUP_PROJECT ${VIEWER_BINARY_NAME})
+endif (WINDOWS)

indra/aistatemachine/CMakeLists.txt

@@ -39,5 +39,9 @@ set_source_files_properties(${aistatemachine_HEADER_FILES}
 list(APPEND aistatemachine_SOURCE_FILES ${aistatemachine_HEADER_FILES})
 
 add_library (aistatemachine ${aistatemachine_SOURCE_FILES})
-add_dependencies(aistatemachine prepare)
 
+target_link_libraries(
+    aistatemachine
+    PUBLIC
+    llcommon
+    )

indra/aistatemachine/aistatemachine.cpp

@@ -293,7 +293,36 @@ void AIEngine::add(AIStateMachine* state_machine)
   }
 }
 
-extern void print_statemachine_diagnostics(U64 total_clocks, U64 max_delta, AIEngine::queued_type::const_reference slowest_state_machine);
+#if STATE_MACHINE_PROFILING
+// Called from AIStateMachine::mainloop
+void print_statemachine_diagnostics(U64 total_clocks, AIStateMachine::StateTimerBase::TimeData& slowest_timer, AIEngine::queued_type::const_reference slowest_element)
+{
+	AIStateMachine const& slowest_state_machine = slowest_element.statemachine();
+	F64 const tfactor = 1000 / calc_clock_frequency();
+	std::ostringstream msg;
+
+	U64 max_delta = slowest_timer.GetDuration();
+
+	if (total_clocks > max_delta)
+	{
+		msg << "AIStateMachine::mainloop did run for " << (total_clocks * tfactor) << " ms. The slowest ";
+	}
+	else
+	{
+		msg << "AIStateMachine::mainloop: A ";
+	}
+	msg << "state machine " << "(" << slowest_state_machine.getName() << ") " << "ran for " << (max_delta * tfactor) << " ms";
+	if (slowest_state_machine.getRuntime() > max_delta)
+	{
+		msg << " (" << (slowest_state_machine.getRuntime() * tfactor) << " ms in total now)";
+	}
+	msg << ".\n";
+
+	AIStateMachine::StateTimerBase::DumpTimers(msg);
+
+	LL_WARNS() << msg.str() << LL_ENDL;
+}
+#endif
 
 // MAIN-THREAD
 void AIEngine::mainloop(void)
@@ -305,28 +334,33 @@ void AIEngine::mainloop(void)
 	queued_element = engine_state_w->list.begin();
   }
   U64 total_clocks = 0;
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-  U64 max_delta = 0;
+#if STATE_MACHINE_PROFILING
   queued_type::value_type slowest_element(NULL);
+  AIStateMachine::StateTimerRoot::TimeData slowest_timer;
 #endif
   while (queued_element != end)
   {
 	AIStateMachine& state_machine(queued_element->statemachine());
-	U64 start = get_clock_count();
-	if (!state_machine.sleep(start))
+	AIStateMachine::StateTimerBase::TimeData time_data;
+	if (!state_machine.sleep(get_clock_count()))
 	{
-	  state_machine.multiplex(AIStateMachine::normal_run);
+		AIStateMachine::StateTimerRoot timer(state_machine.getName());
+		state_machine.multiplex(AIStateMachine::normal_run);
+		time_data = timer.GetTimerData();
 	}
-	U64 delta = get_clock_count() - start;
-	state_machine.add(delta);
-	total_clocks += delta;
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-	if (delta > max_delta)
+	if (U64 delta = time_data.GetDuration())
 	{
-	  max_delta = delta;
-	  slowest_element = *queued_element;
-	}
+		state_machine.add(delta);
+		total_clocks += delta;
+#if STATE_MACHINE_PROFILING
+		if (delta > slowest_timer.GetDuration())
+		{
+			slowest_element = *queued_element;
+			slowest_timer = time_data;
+		}
 #endif
+	}
+
 	bool active = state_machine.active(this);		// This locks mState shortly, so it must be called before locking mEngineState because add() locks mEngineState while holding mState.
 	engine_state_type_wat engine_state_w(mEngineState);
 	if (!active)
@@ -340,8 +374,8 @@ void AIEngine::mainloop(void)
 	}
 	if (total_clocks >= sMaxCount)
 	{
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-	  print_statemachine_diagnostics(total_clocks, max_delta, slowest_element);
+#if STATE_MACHINE_PROFILING
+		print_statemachine_diagnostics(total_clocks, slowest_timer, slowest_element);
 #endif
 	  Dout(dc::statemachine, "Sorting " << engine_state_w->list.size() << " state machines.");
 	  engine_state_w->list.sort(QueueElementComp());
@@ -373,7 +407,7 @@ void AIEngine::setMaxCount(F32 StateMachineMaxTime)
   sMaxCount = calc_clock_frequency() * StateMachineMaxTime / 1000;
 }
 
-#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
+#ifdef CWDEBUG
 char const* AIStateMachine::event_str(event_type event)
 {
   switch(event)
@@ -406,7 +440,7 @@ void AIStateMachine::multiplex(event_type event)
 	// our need to run (by us having set need_run), so there is no need to run
 	// ourselves.
 	llassert(!mMultiplexMutex.isSelfLocked());		// We may never enter recursively!
-	if (!mMultiplexMutex.tryLock())
+	if (!mMultiplexMutex.try_lock())
 	{
 	  Dout(dc::statemachine(mSMDebug), "Leaving because it is already being run [" << (void*)this << "]");
 	  return;
@@ -728,7 +762,7 @@ void AIStateMachine::multiplex(event_type event)
 		//=========================================
 
 		// Release the lock on mMultiplexMutex *first*, before releasing the lock on mState,
-		// to avoid to ever call the tryLock() and fail, while this thread isn't still
+		// to avoid to ever call the try_lock() and fail, while this thread isn't still
 		// BEFORE the critical area of mState!
 
 		mMultiplexMutex.unlock();
@@ -752,6 +786,22 @@ void AIStateMachine::multiplex(event_type event)
   }
 }
 
+#if STATE_MACHINE_PROFILING
+std::vector<AIStateMachine::StateTimerBase*> AIStateMachine::StateTimerBase::mTimerStack;
+AIStateMachine::StateTimerBase::TimeData AIStateMachine::StateTimerBase::TimeData::sRoot("");
+void AIStateMachine::StateTimer::TimeData::DumpTimer(std::ostringstream& msg, std::string prefix)
+{
+	F64 const tfactor = 1000 / calc_clock_frequency();
+	msg << prefix << mName << " " << (mEnd - mStart)*tfactor << "ms" << std::endl;
+	prefix.push_back(' ');
+	std::vector<TimeData>::iterator it;
+	for (it = mChildren.begin(); it != mChildren.end(); ++it)
+	{
+		it->DumpTimer(msg, prefix);
+	}
+}
+#endif
+
 AIStateMachine::state_type AIStateMachine::begin_loop(base_state_type base_state)
 {
   DoutEntering(dc::statemachine(mSMDebug), "AIStateMachine::begin_loop(" << state_str(base_state) << ") [" << (void*)this << "]");
@@ -1212,9 +1262,9 @@ void AIStateMachine::abort(void)
 	multiplex(insert_abort);
   }
   // Block until the current run finished.
-  if (!mRunMutex.tryLock())
+  if (!mRunMutex.try_lock())
   {
-	llwarns << "AIStateMachine::abort() blocks because the statemachine is still executing code in another thread." << llendl;
+	LL_WARNS() << "AIStateMachine::abort() blocks because the statemachine is still executing code in another thread." << LL_ENDL;
 	mRunMutex.lock();
   }
   mRunMutex.unlock();
@@ -1413,6 +1463,6 @@ void stopEngineThread(void)
   {
 	ms_sleep(10);
   }
-  llinfos << "State machine thread" << (!AIEngineThread::sInstance->isStopped() ? " not" : "") << " stopped after " << ((400 - count) * 10) << "ms." << llendl;
+  LL_INFOS() << "State machine thread" << (!AIEngineThread::sInstance->isStopped() ? " not" : "") << " stopped after " << ((400 - count) * 10) << "ms." << LL_ENDL;
 }
 

indra/aistatemachine/aistatemachine.h

@@ -36,6 +36,7 @@
 
 #include "aithreadsafe.h"
 #include <llpointer.h>
+#include "lltimer.h"
 #include <list>
 #include <boost/signals2.hpp>
 
@@ -98,11 +99,143 @@ class AIEngine
 extern AIEngine gMainThreadEngine;
 extern AIEngine gStateMachineThreadEngine;
 
+#ifndef STATE_MACHINE_PROFILING
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+#define STATE_MACHINE_PROFILING 1
+#endif
+#endif
+
 class AIStateMachine : public LLThreadSafeRefCount
 {
   public:
 	typedef U32 state_type;		//!< The type of run_state
 
+	// A simple timer class that will calculate time delta between ctor and GetTimerData call.
+	// Time data is stored as a nested TimeData object.
+	// If STATE_MACHINE_PROFILING is defined then a stack of all StateTimers from root is maintained for debug output.
+	class StateTimerBase
+	{
+	public:
+		class TimeData
+		{
+			friend class StateTimerBase;
+		public:
+			TimeData() : mStart(-1), mEnd(-1) {}
+			U64 GetDuration() {	return mEnd - mStart; }
+		private:
+			U64 mStart, mEnd;
+
+#if !STATE_MACHINE_PROFILING
+			TimeData(const std::string& name) : mStart(get_clock_count()), mEnd(get_clock_count()) {}
+#else
+			TimeData(const std::string& name) : mName(name), mStart(get_clock_count()), mEnd(get_clock_count()) {}
+			void DumpTimer(std::ostringstream& msg, std::string prefix);
+			std::vector<TimeData> mChildren;
+			std::string mName;	
+			static TimeData sRoot;
+#endif
+		};
+#if !STATE_MACHINE_PROFILING
+		StateTimerBase(const std::string& name) : mData(name) {}
+		~StateTimerBase() {}
+	protected:
+		TimeData mData;
+		// Return a copy of the underlying timer data.
+		// This allows the data live beyond the scope of the state timer.
+	public:
+		const TimeData GetTimerData()
+		{
+			mData.mEnd = get_clock_count();	//set mEnd to current time, since GetTimerData() will always be called before the dtor, obv.
+			return mData;
+		}
+#else
+	protected:
+		// Ctors/dtors are hidden. Only StateTimerRoot and StateTimer are permitted to access them.
+		StateTimerBase() : mData(NULL) {}
+		~StateTimerBase()
+		{
+			// If mData is null then the timer was not registered due to being in the wrong thread or the root timer wasn't in the expected state.
+			if (!mData)
+				return;
+			mData->mEnd = get_clock_count();
+			mTimerStack.pop_back();
+		}
+
+		// Also hide internals from everything except StateTimerRoot and StateTimer
+		bool AddAsRoot(const std::string& name)
+		{
+			
+			if (!is_main_thread())
+				return true;	//Ignoring this timer, but pretending it was added.
+			if (!mTimerStack.empty())
+				return false;
+			TimeData::sRoot = TimeData(name);
+			mData = &TimeData::sRoot;
+			mData->mChildren.clear();	
+			mTimerStack.push_back(this);
+			return true;
+		}
+		bool AddAsChild(const std::string& name)
+		{
+			if (!is_main_thread())
+				return true;	//Ignoring this timer, but pretending it was added.
+			if (mTimerStack.empty())
+				return false;
+			mTimerStack.back()->mData->mChildren.push_back(TimeData(name));
+			mData = &mTimerStack.back()->mData->mChildren.back();
+			mTimerStack.push_back(this);
+			return true;
+		}
+
+		TimeData* mData;
+		static std::vector<StateTimerBase*> mTimerStack;
+
+	public:
+		// Debug spew
+		static void DumpTimers(std::ostringstream& msg)
+		{
+			TimeData::sRoot.DumpTimer(msg, "");
+		}
+
+		// Return a copy of the underlying timer data.
+		// This allows the data live beyond the scope of the state timer.
+		const TimeData GetTimerData() const
+		{
+			if (mData)
+			{
+				TimeData ret = *mData;
+				ret.mEnd = get_clock_count();	//set mEnd to current time, since GetTimerData() will always be called before the dtor, obv.
+				return ret;
+			}
+			return TimeData();
+		}
+#endif
+	};
+public:
+#if !STATE_MACHINE_PROFILING
+	typedef StateTimerBase StateTimerRoot;
+	typedef StateTimerBase StateTimer;
+#else
+	class StateTimerRoot : public StateTimerBase
+	{ //A StateTimerRoot can become a child if a root already exists.
+	public:
+		StateTimerRoot(const std::string& name)
+		{
+			if(!AddAsRoot(name))
+				AddAsChild(name);	
+		}
+	};
+	class StateTimer : public StateTimerBase
+	{ //A StateTimer can never become a root
+	public:
+		StateTimer(const std::string& name)
+		{
+			AddAsChild(name);
+		}
+	};
+#endif
+
+
   protected:
 	// The type of event that causes multiplex() to be called.
 	enum event_type {
@@ -295,19 +428,23 @@ class AIStateMachine : public LLThreadSafeRefCount
 
 	// Return stringified state, for debugging purposes.
 	char const* state_str(base_state_type state);
-#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
+#ifdef CWDEBUG
 	char const* event_str(event_type event);
 #endif
 
 	void add(U64 count) { mRuntime += count; }
 	U64 getRuntime(void) const { return mRuntime; }
 
+	// For diagnostics. Every derived class must override this.
+	virtual const char* getName() const = 0;
+
   protected:
 	virtual void initialize_impl(void) = 0;
 	virtual void multiplex_impl(state_type run_state) = 0;
 	virtual void abort_impl(void) { }
 	virtual void finish_impl(void) { }
 	virtual char const* state_str_impl(state_type run_state) const = 0;
+	virtual void force_killed(void);										// Called from AIEngine::flush().
 
   private:
 	void reset(void);														// Called from run() to (re)initialize a (re)start.
@@ -324,7 +461,6 @@ class AIStateMachine : public LLThreadSafeRefCount
 		mSleep = 0;
 	  return mSleep != 0;
 	}
-	void force_killed(void);												// Called from AIEngine::flush().
 
 	friend class AIEngine;						// Calls multiplex() and force_killed().
 };

indra/aistatemachine/aistatemachinethread.cpp

@@ -149,7 +149,7 @@ void AIStateMachineThreadBase::abort_impl(void)
 	{
 	  // The thread is still happily running (and will clean up itself).
 	  // Lets make sure we're not flooded with this situation.
-	  llwarns << "Thread state machine aborted while the thread is still running. That is a waste of CPU and should be avoided." << llendl;
+	  LL_WARNS() << "Thread state machine aborted while the thread is still running. That is a waste of CPU and should be avoided." << LL_ENDL;
 	}
   }
 }

indra/aistatemachine/aistatemachinethread.h

@@ -34,6 +34,7 @@
 #include "aistatemachine.h"
 #include "llthread.h"
 #include "aithreadsafe.h"
+#include <boost/format.hpp>
 
 #ifdef EXAMPLE_CODE	// undefined
 
@@ -232,6 +233,13 @@ class AIStateMachineThread : public AIStateMachineThreadBase {
 	// Accessor.
 	THREAD_IMPL& thread_impl(void) { return mThreadImpl; }
 
+	/*virtual*/ const char* getName() const
+	{
+#define STRIZE(arg) #arg
+		return (boost::format("%1%%2%%3%") % "AIStateMachineThread<" % STRIZE(THREAD_IMPL) % ">").str().c_str();
+#undef STRIZE
+	}
+
   protected:
 	/*virtual*/ AIThreadImpl& impl(void) { return mThreadImpl; }
 };

indra/aistatemachine/aitimer.h

@@ -98,6 +98,8 @@ class AITimer : public AIStateMachine {
 	 */
 	F64 getInterval(void) const { return mInterval; }
 
+	/*virtual*/ const char* getName() const { return "AITimer"; }
+
   protected:
 	// Call finish() (or abort()), not delete.
 	/*virtual*/ ~AITimer() { DoutEntering(dc::statemachine(mSMDebug), "~AITimer() [" << (void*)this << "]"); mFrameTimer.cancel(); }

indra/cmake/00-Common.cmake

@@ -5,9 +5,9 @@
 if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
 set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
 
+include(CheckCCompilerFlag)
 include(Variables)
 
-
 # Portable compilation flags.
 
 set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
@@ -18,42 +18,12 @@ set(CMAKE_C_FLAGS_RELEASE
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
     "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
-# Configure crash reporting
-set(RELEASE_CRASH_REPORTING OFF CACHE BOOL "Enable use of crash reporting in release builds")
-set(NON_RELEASE_CRASH_REPORTING OFF CACHE BOOL "Enable use of crash reporting in developer builds")
-
-if(RELEASE_CRASH_REPORTING)
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DLL_SEND_CRASH_REPORTS=1")
-endif()
-
-if(NON_RELEASE_CRASH_REPORTING)
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DLL_SEND_CRASH_REPORTS=1")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DLL_SEND_CRASH_REPORTS=1")
-endif()
-
-
 # Don't bother with a MinSizeRel build.
-
 set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;Debug" CACHE STRING
     "Supported build types." FORCE)
 
 # Platform-specific compilation flags.
-
 if (WINDOWS)
-  # Various libs are compiler specific, generate some variables here we can just use
-  # when we require them instead of reimplementing the test each time.
-  if (MSVC10)
-    set(MSVC_DIR 10.0)
-    set(MSVC_SUFFIX 100)
-  endif (MSVC10)
-  if (MSVC11)
-    set(MSVC_DIR 11.0)
-    set(MSVC_SUFFIX 110)
-  endif (MSVC11)
-
-  # Remove default /Zm1000 flag that cmake inserts
-  string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-
   # Don't build DLLs.
   set(BUILD_SHARED_LIBS OFF)
 
@@ -63,50 +33,88 @@ if (WINDOWS)
       "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
   set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /fp:fast -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /Zo /MD /MP /Ob2 /Zc:inline /fp:fast -D_ITERATOR_DEBUG_LEVEL=0"
       CACHE STRING "C++ compiler release options" FORCE)
   set(CMAKE_C_FLAGS_RELEASE
       "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /fp:fast"
       CACHE STRING "C compiler release options" FORCE)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
+
+  if (ADDRESS_SIZE EQUAL 32)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
+  endif (ADDRESS_SIZE EQUAL 32)
+
+  if (FULL_DEBUG_SYMS OR USE_CRASHPAD)
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FULL")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FULL")
+  else ()
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FASTLINK")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG:FASTLINK")
+  endif ()
+
+  if (USE_LTO)
+    if(INCREMENTAL_LINK)
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG:INCREMENTAL")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG:INCREMENTAL")
+      set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG:INCREMENTAL")
+    else(INCREMENTAL_LINK)
+      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
+      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
+      set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
+    endif(INCREMENTAL_LINK)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /OPT:ICF /LTCG")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /OPT:ICF /LTCG")
+    set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG")
+  elseif (INCREMENTAL_LINK)
+    set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS} /INCREMENTAL /VERBOSE:INCR")
+    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL /VERBOSE:INCR")
+  else ()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:REF /INCREMENTAL:NO")
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:REF /INCREMENTAL:NO")
+  endif ()
 
   set(CMAKE_CXX_STANDARD_LIBRARIES "")
   set(CMAKE_C_STANDARD_LIBRARIES "")
 
   add_definitions(
       /DLL_WINDOWS=1
+      /DNOMINMAX
       /DUNICODE
-      /D_UNICODE 
+      /D_UNICODE
+      /DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
       /GS
       /TP
       /W3
       /c
+      /Zc:__cplusplus
       /Zc:forScope
-	    /Zc:wchar_t-
+      /Zc:rvalueCast
+      /Zc:wchar_t
       /nologo
       /Oy-
+      /Zm140
+      /wd4267
+      /wd4244
       )
-  
-  # SSE2 is implied on win64
-  if(WORD_SIZE EQUAL 32)
-    add_definitions(/arch:SSE2)
-  else(WORD_SIZE EQUAL 32)
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4267 /wd4250 /wd4244")
-  endif(WORD_SIZE EQUAL 32)
 
-  # configure win32 API for windows XP+ compatibility
-  set(WINVER "0x0501" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
-  add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
+  if (USE_LTO)
+    add_compile_options(
+        /GL
+        /Gy
+        /Gw
+        )
+  endif (USE_LTO)
+
+  if (ADDRESS_SIZE EQUAL 32)
+    add_compile_options(/arch:SSE2)
+  endif (ADDRESS_SIZE EQUAL 32)
 
-  # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT DISABLE_FATAL_WARNINGS)
     add_definitions(/WX)
   endif (NOT DISABLE_FATAL_WARNINGS)
 
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
-  SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO")
-  SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
-
+  # configure win32 API for windows Vista+ compatibility
+  set(WINVER "0x0600" CACHE STRING "Win32 API Target version (see http://msdn.microsoft.com/en-us/library/aa383745%28v=VS.85%29.aspx)")
+  add_definitions("/DWINVER=${WINVER}" "/D_WIN32_WINNT=${WINVER}")
 endif (WINDOWS)
 
 set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math")
@@ -114,20 +122,30 @@ set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math")
 if (LINUX)
   set(CMAKE_SKIP_RPATH TRUE)
 
-  add_definitions(
-      -DLL_LINUX=1
-      -DAPPID=secondlife
-      -D_REENTRANT
-      -fexceptions
-      -fno-math-errno
-      -fno-strict-aliasing
-      -fsigned-char
-      -fvisibility=hidden
-      -g
-      -pthread
-      )
+  add_compile_options(
+    -fvisibility=hidden
+    -fexceptions
+    -fno-math-errno
+    -fno-strict-aliasing
+    -fsigned-char
+    -g
+    -pthread
+    )
 
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_FORTIFY_SOURCE=2 ")
+  add_definitions(
+    -DLL_LINUX=1
+    -DAPPID=secondlife
+    -D_REENTRANT
+    -DGDK_DISABLE_DEPRECATED 
+    -DGTK_DISABLE_DEPRECATED
+    -DGSEAL_ENABLE
+    -DGTK_DISABLE_SINGLE_INCLUDES
+  )
+
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++14")
+
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
 
   # Don't catch SIGCHLD in our base application class for the viewer
   # some of our 3rd party libs may need their *own* SIGCHLD handler to work.  Sigh!
@@ -182,50 +200,40 @@ if (LINUX)
 
     # End of hacks.
 
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+    CHECK_C_COMPILER_FLAG(-fstack-protector-strong HAS_STRONG_STACK_PROTECTOR)
+    if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+      if(HAS_STRONG_STACK_PROTECTOR)
+        add_compile_options(-fstack-protector-strong)
+      endif(HAS_STRONG_STACK_PROTECTOR)
+    endif (${CMAKE_BUILD_TYPE} STREQUAL "Release")
 
-    if (NOT STANDALONE)
-      # this stops us requiring a really recent glibc at runtime
-      add_definitions(-fno-stack-protector)
-    endif (NOT STANDALONE)
     if (${ARCH} STREQUAL "x86_64")
-      add_definitions(-DLINUX64=1 -pipe)
-      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
-      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
-      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ffast-math")
-      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math")
+      add_definitions(-pipe)
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ffast-math -msse4.1")
+      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ffast-math -msse4.1")
+      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ffast-math -msse4.1")
+      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math -msse4.1")
     else (${ARCH} STREQUAL "x86_64")
       if (NOT STANDALONE)
         set(MARCH_FLAG " -march=pentium4")
       endif (NOT STANDALONE)
-      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
-      set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
-      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
-      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
-      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
-      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
+      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse3")
+      set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse3")
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse3 ${GCC_EXTRA_OPTIMIZATIONS}")
+      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -mfpmath=sse,387 -msse3 ${GCC_EXTRA_OPTIMIZATIONS}")
+      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse3 ${GCC_EXTRA_OPTIMIZATIONS}")
+      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse3 ${GCC_EXTRA_OPTIMIZATIONS}")
     endif (${ARCH} STREQUAL "x86_64")
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    if (NOT STANDALONE)
-      # this stops us requiring a really recent glibc at runtime
-      add_definitions(-fno-stack-protector)
-    endif (NOT STANDALONE)
-
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse2")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -msse2")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -msse2")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse2")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse3")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline -msse3")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}${MARCH_FLAG} -msse3")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}${MARCH_FLAG} -msse3")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse3")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -msse3")
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-
     if (NOT STANDALONE)
-      # this stops us requiring a really recent glibc at runtime
-      add_definitions(-fno-stack-protector)
-    endif (NOT STANDALONE)
-
-    if (NOT STANDALONE)
-      set(MARCH_FLAG " -axsse4.1 -msse2")
+      set(MARCH_FLAG " -axsse4.1 -msse3")
     endif (NOT STANDALONE)
 
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}${MARCH_FLAG} -fno-inline-functions")
@@ -246,30 +254,28 @@ endif (LINUX)
 
 
 if (DARWIN)
-  add_definitions(-DLL_DARWIN=1 -D_XOPEN_SOURCE)
-  set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
+  add_definitions(-DLL_DARWIN=1)
+  set(CMAKE_CXX_LINK_FLAGS "-Wl,-no_compact_unwind -Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-
-  if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
-    # NOTE: it's critical that the optimization flag is put in front.
-    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    # NOTE: it's critical that the optimization flag is put in front.
-    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3")
-  endif()
+  set(DARWIN_extra_cstar_flags "-g")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags} -ftemplate-depth=256")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${DARWIN_extra_cstar_flags}")
+  # NOTE: it's critical that the optimization flag is put in front.
+  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O0 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_X86_VECTOR_INSTRUCTIONS SSE3)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL -O3)
+  set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse3 ${CMAKE_CXX_FLAGS_RELEASE}")
+  set(CMAKE_C_FLAGS_RELEASE "-O3 -msse3 ${CMAKE_C_FLAGS_RELEASE}")
+  if (XCODE_VERSION GREATER 4.2)
+    set(ENABLE_SIGNING TRUE)
+    set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
+  endif (XCODE_VERSION GREATER 4.2)
 endif (DARWIN)
 
 
+
 if (LINUX OR DARWIN)
   if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     add_definitions(-DLL_GNUC=1)
@@ -277,13 +283,11 @@ if (LINUX OR DARWIN)
     set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS} -Wno-reorder -Wno-non-virtual-dtor -Woverloaded-virtual")
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     add_definitions(-DLL_CLANG=1)
-    set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses -Wno-non-virtual-dtor")
-    set(UNIX_WARNINGS "${UNIX_WARNINGS} -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable")
+    set(UNIX_WARNINGS "-Wall -Wno-sign-compare -Wno-trigraphs -Wno-tautological-compare -Wno-char-subscripts -Wno-gnu -Wno-logical-op-parentheses -Wno-logical-not-parentheses -Wno-non-virtual-dtor -Wno-deprecated")
+    set(UNIX_WARNINGS "${UNIX_WARNINGS} -Woverloaded-virtual -Wno-parentheses-equality -Wno-reorder -Wno-unused-function -Wno-unused-value -Wno-unused-variable -Wno-unused-private-field -Wno-parentheses")
     set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}")
   elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
     add_definitions(-DLL_ICC=1)
-    set(UNIX_WARNINGS "-wd327 -wd597 -wd858")
-    set(UNIX_CXX_WARNINGS "${UNIX_WARNINGS}")
   endif ()
   
   if (NOT DISABLE_FATAL_WARNINGS)
@@ -293,27 +297,35 @@ 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)
 
 
 if (STANDALONE)
   add_definitions(-DLL_STANDALONE=1)
 else (STANDALONE)
+  #Enforce compile-time correctness for fmt strings
+  add_definitions(-DFMT_STRING_ALIAS=1)
+
+  if(USE_CRASHPAD)
+    add_definitions(-DUSE_CRASHPAD=1 -DCRASHPAD_URL="${CRASHPAD_URL}")
+  endif()
+
   set(${ARCH}_linux_INCLUDES
-      ELFIO
       atk-1.0
+      cairo
       glib-2.0
+      gdk-pixbuf-2.0
       gstreamer-0.10
       gtk-2.0
-      freetype2
       pango-1.0
+      pixman-1
       )
 endif (STANDALONE)
 

indra/cmake/APR.cmake

@@ -1,4 +1,3 @@
-include(BerkeleyDB)
 include(Linking)
 include(Prebuilt)
 
@@ -13,36 +12,41 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(apr_suite)
   if (WINDOWS)
+    if (LLCOMMON_LINK_SHARED)
+      set(APR_selector "lib")
+    else (LLCOMMON_LINK_SHARED)
+      set(APR_selector "")
+    endif (LLCOMMON_LINK_SHARED)
     set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apr-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
       )
     set(APRICONV_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapriconv-1.lib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapriconv-1.lib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}apriconv-1.lib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apriconv-1.lib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.lib ${APRICONV_LIBRARIES}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.lib ${APRICONV_LIBRARIES}
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib ${APRICONV_LIBRARIES}
       )
+    if(NOT LLCOMMON_LINK_SHARED)
+      list(APPEND APR_LIBRARIES Rpcrt4)
+    endif(NOT LLCOMMON_LINK_SHARED)
   elseif (DARWIN)
-    set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
-      )
-    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.dylib
-      )
+    if (LLCOMMON_LINK_SHARED)
+      set(APR_selector     "0.dylib")
+      set(APRUTIL_selector "0.dylib")
+    else (LLCOMMON_LINK_SHARED)
+      set(APR_selector     "a")
+      set(APRUTIL_selector "a")
+    endif (LLCOMMON_LINK_SHARED)
+    set(APR_LIBRARIES libapr-1.${APR_selector})
+    set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector})
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)
     set(APR_LIBRARIES apr-1)
     set(APRUTIL_LIBRARIES aprutil-1)
     set(APRICONV_LIBRARIES iconv)
   endif (WINDOWS)
-  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
-
-  if (LINUX)
-    list(APPEND APRUTIL_LIBRARIES ${DB_LIBRARIES})
-  endif (LINUX)
+  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
 endif (STANDALONE)

indra/cmake/Audio.cmake

@@ -1,15 +1,15 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (LINUX)
   include(FindPkgConfig)
   pkg_check_modules(OGG REQUIRED ogg)
   pkg_check_modules(VORBIS REQUIRED vorbis)
   pkg_check_modules(VORBISENC REQUIRED vorbisenc)
   pkg_check_modules(VORBISFILE REQUIRED vorbisfile)
-else (STANDALONE)
-  use_prebuilt_binary(ogg-vorbis)
-  set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+else (LINUX)
+  use_prebuilt_binary(ogg_vorbis)
+  set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
   set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
   set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
 
@@ -32,7 +32,7 @@ else (STANDALONE)
     set(VORBISENC_LIBRARIES vorbisenc)
     set(VORBISFILE_LIBRARIES vorbisfile)
   endif (WINDOWS)
-endif (STANDALONE)
+endif (LINUX)
 
 link_directories(
     ${VORBIS_LIBRARY_DIRS}

indra/cmake/BerkeleyDB.cmake

@@ -1,17 +0,0 @@
-include(Prebuilt)
-
-set(DB_FIND_QUIETLY ON)
-set(DB_FIND_REQUIRED ON)
-
-if (STANDALONE)
-  include(FindBerkeleyDB)
-else (STANDALONE)
-  if (LINUX)
-    # Need to add dependency pthread explicitely to support ld.gold.
-    use_prebuilt_binary(db)
-    set(DB_LIBRARIES db-5.1 pthread)
-  else (LINUX)
-    set(DB_LIBRARIES db-4.2)
-  endif (LINUX)
-  set(DB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-endif (STANDALONE)

indra/cmake/Boost.cmake

@@ -11,8 +11,8 @@ if (STANDALONE)
   find_package(Boost 1.51.0 COMPONENTS date_time filesystem program_options regex system thread wave context)
 else (STANDALONE)
   use_prebuilt_binary(boost)
-  set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-  set(Boost_VERSION "1.52")
+  set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
+  set(Boost_VERSION "1.60")
 
   if (WINDOWS)
     set(Boost_CONTEXT_LIBRARY 
@@ -38,26 +38,26 @@ else (STANDALONE)
         debug libboost_thread-mt-gd)
   elseif (LINUX)
     set(Boost_CONTEXT_LIBRARY
-        optimized boost_context-mt.a
-        debug boost_context-mt-d.a)
+        optimized boost_context-mt
+        debug boost_context-mt-d)
     set(Boost_FILESYSTEM_LIBRARY
-        optimized boost_filesystem-mt.a
-        debug boost_filesystem-mt-d.a)
+        optimized boost_filesystem-mt
+        debug boost_filesystem-mt-d)
     set(Boost_PROGRAM_OPTIONS_LIBRARY
-        optimized boost_program_options-mt.a
-        debug boost_program_options-mt-d.a)
+        optimized boost_program_options-mt
+        debug boost_program_options-mt-d)
     set(Boost_REGEX_LIBRARY
-        optimized boost_regex-mt.a
-        debug boost_regex-mt-d.a)
+        optimized boost_regex-mt
+        debug boost_regex-mt-d)
     set(Boost_SIGNALS_LIBRARY
-        optimized boost_signals-mt.a
-        debug boost_signals-mt-d.a)
+        optimized boost_signals-mt
+        debug boost_signals-mt-d)
     set(Boost_SYSTEM_LIBRARY
-        optimized boost_system-mt.a
-        debug boost_system-mt-d.a)
+        optimized boost_system-mt
+        debug boost_system-mt-d)
     set(Boost_THREAD_LIBRARY
-        optimized boost_thread-mt.a
-        debug boost_thread-mt-d.a)
+        optimized boost_thread-mt
+        debug boost_thread-mt-d)
   elseif (DARWIN)
     set(Boost_CONTEXT_LIBRARY
         optimized boost_context-mt

indra/cmake/BuildBranding.cmake

@@ -0,0 +1,38 @@
+# -*- cmake -*-
+if (WINDOWS)
+   #message(WARNING, ${CMAKE_CURRENT_BINARY_DIR}/newview/viewerRes.rc.in)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/res/viewerRes.rc.in
+       ${CMAKE_CURRENT_BINARY_DIR}/viewerRes.rc
+   )
+endif (WINDOWS)
+
+if (DARWIN)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/English.lproj/InfoPlist.strings.in
+       ${CMAKE_CURRENT_BINARY_DIR}/English.lproj/InfoPlist.strings
+   )
+endif (DARWIN)
+
+if (LINUX)
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/wrapper.sh.in
+       ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/wrapper.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/handle_secondlifeprotocol.sh.in
+       ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/handle_secondlifeprotocol.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/install.sh.in
+       ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/install.sh
+       @ONLY
+   )
+   configure_file(
+       ${CMAKE_SOURCE_DIR}/newview/linux_tools/refresh_desktop_app_entry.sh.in
+       ${CMAKE_CURRENT_BINARY_DIR}/linux_tools/refresh_desktop_app_entry.sh
+       @ONLY
+   )
+endif (LINUX)

indra/cmake/BuildPackagesInfo.cmake

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

indra/cmake/BuildVersion.cmake

@@ -1,45 +1,55 @@
 # -*- cmake -*-
+# Construct the viewer version number based on the indra/VIEWER_VERSION file
 
-# Read version components from the header file.
-file(STRINGS ${LIBS_OPEN_DIR}/llcommon/llversionviewer.h.in lines
-   REGEX " LL_VERSION_")
-foreach(line ${lines})
-  string(REGEX REPLACE ".*LL_VERSION_([A-Z]+).*" "\\1" comp "${line}")
-  string(REGEX REPLACE ".* = ([0-9]+);.*" "\\1" value "${line}")
-  set(v${comp} "${value}")
-endforeach(line)
+if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/newview/
+    set(VIEWER_VERSION_BASE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/newview/VIEWER_VERSION.txt")
 
-execute_process(
-    COMMAND git rev-list HEAD
-    OUTPUT_VARIABLE GIT_REV_LIST_STR
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+    if ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
+        file(STRINGS ${VIEWER_VERSION_BASE_FILE} VIEWER_SHORT_VERSION REGEX "^[0-9]+\\.[0-9]+\\.[0-9]+")
+        string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" VIEWER_VERSION_MAJOR ${VIEWER_SHORT_VERSION})
+        string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" VIEWER_VERSION_MINOR ${VIEWER_SHORT_VERSION})
+        string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" VIEWER_VERSION_PATCH ${VIEWER_SHORT_VERSION})
 
-if(GIT_REV_LIST_STR)
-  string(REPLACE "\n" ";" GIT_REV_LIST ${GIT_REV_LIST_STR})
-else()
-  string(REPLACE "\n" ";" GIT_REV_LIST "")
-endif()
+        if (DEFINED ENV{revision})
+           set(VIEWER_VERSION_REVISION $ENV{revision})
+           message("Revision (from environment): ${VIEWER_VERSION_REVISION}")
 
-if(GIT_REV_LIST)
-  list(LENGTH GIT_REV_LIST vBUILD)
-else()
-  set(vBUILD 99)
-endif()
+        else (DEFINED ENV{revision})
+          execute_process(
+                       COMMAND git rev-list HEAD
+                       OUTPUT_VARIABLE GIT_REV_LIST_STR
+                       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                       OUTPUT_STRIP_TRAILING_WHITESPACE
+                       )
 
-configure_file(
-    ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h.in
-    ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h
-)
+            if(GIT_REV_LIST_STR)
+              string(REPLACE "\n" ";" GIT_REV_LIST ${GIT_REV_LIST_STR})
+            else()
+              string(REPLACE "\n" ";" GIT_REV_LIST "")
+            endif()
 
-# Compose the version.
-set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
-if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
-  message(STATUS "Version is ${viewer_VERSION}")
-else (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
-  message(FATAL_ERROR "Could not determine version (${viewer_VERSION})")
-endif (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+            if(GIT_REV_LIST)
+              list(LENGTH GIT_REV_LIST VIEWER_VERSION_REVISION)
+            else(GIT_REV_LIST)
+              set(VIEWER_VERSION_REVISION 99)
+            endif(GIT_REV_LIST)
+        endif (DEFINED ENV{revision})
+        message("Building '${VIEWER_CHANNEL}' Version ${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}")
+    else ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
+        message(SEND_ERROR "Cannot get viewer version from '${VIEWER_VERSION_BASE_FILE}'") 
+    endif ( EXISTS ${VIEWER_VERSION_BASE_FILE} )
 
-# Report version to caller.
-#set(viewer_VERSION "${viewer_VERSION}" PARENT_SCOPE)
+    if ("${VIEWER_VERSION_REVISION}" STREQUAL "")
+      message("Ultimate fallback, revision was blank or not set: will use 0")
+      set(VIEWER_VERSION_REVISION 0)
+    endif ("${VIEWER_VERSION_REVISION}" STREQUAL "")
+
+    set(VIEWER_CHANNEL_VERSION_DEFINES
+        "LL_VIEWER_CHANNEL=\"${VIEWER_CHANNEL}\""
+        "LL_VIEWER_CHANNEL_GRK=L\"${VIEWER_CHANNEL_GRK}\""
+        "LL_VIEWER_VERSION_MAJOR=${VIEWER_VERSION_MAJOR}"
+        "LL_VIEWER_VERSION_MINOR=${VIEWER_VERSION_MINOR}"
+        "LL_VIEWER_VERSION_PATCH=${VIEWER_VERSION_PATCH}"
+        "LL_VIEWER_VERSION_BUILD=${VIEWER_VERSION_REVISION}"
+        )
+endif (NOT DEFINED VIEWER_SHORT_VERSION)

indra/cmake/CARes.cmake

@@ -13,12 +13,12 @@ else (STANDALONE)
         add_definitions("-DCARES_STATICLIB")
         set(CARES_LIBRARIES areslib)
     elseif (DARWIN)
-        set(CARES_LIBRARIES
-          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a
-          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a
+        set(CARES_LIBRARIES 
+          debug libcares.a
+          optimized libcares.a
           )
     else (WINDOWS)
         set(CARES_LIBRARIES cares)
     endif (WINDOWS)
-    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ares)
+    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
 endif (STANDALONE)

indra/cmake/CEFPlugin.cmake

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

indra/cmake/CMakeLists.txt

@@ -12,50 +12,44 @@ set(cmake_SOURCE_FILES
     APR.cmake
     Audio.cmake
     BasicPluginBase.cmake
-    BerkeleyDB.cmake
     Boost.cmake
+    BuildBranding.cmake
     BuildVersion.cmake
     CARes.cmake
+    CEFPlugin.cmake
     CMakeCopyIfDifferent.cmake
-    CURL.cmake
     Colladadom.cmake
     ConfigurePkgConfig.cmake
-    CopyBackToSource.cmake
-    CopyWinLibs.cmake
+    CURL.cmake
+    Copy3rdPartyLibs.cmake
+    CrashPad.cmake
     Cwdebug.cmake
     DBusGlib.cmake
-    DirectX.cmake
-    DownloadPrebuilt.cmake.in
-    ELFIO.cmake
+    DeploySharedLibs.cmake
     EXPAT.cmake
     ExamplePlugin.cmake
-    FMOD.cmake
-    FMODEX.cmake
     FindAPR.cmake
-    FindBerkeleyDB.cmake
+    FindAutobuild.cmake
     FindCARes.cmake
     FindColladadom.cmake
-    FindELFIO.cmake
     FindGLOD.cmake
-    FindGoogleBreakpad.cmake
     FindGooglePerfTools.cmake
     FindHunSpell.cmake
-    FindJsonCpp.cmake
-    FindLLQtWebkit.cmake
     FindNDOF.cmake
     FindOpenJPEG.cmake
     FindTut.cmake
+    FindURIPARSER.cmake
     FindXmlRpcEpi.cmake
+    FMODSTUDIO.cmake
     FreeType.cmake
+    GeneratePrecompiledHeader.cmake
     GLOD.cmake
     GStreamer010Plugin.cmake
     Glui.cmake
     Glut.cmake
-    GoogleBreakpad.cmake
     GooglePerfTools.cmake
     Hunspell.cmake
     JPEG.cmake
-    JsonCpp.cmake
     LLAddBuildTest.cmake
     LLAppearance.cmake
     LLAudio.cmake
@@ -70,9 +64,8 @@ set(cmake_SOURCE_FILES
     LLPlugin.cmake
     LLPrimitive.cmake
     LLPhysicsExtensions.cmake
-    LLSharedLibs.cmake
-    LLQtWebkit.cmake
     LLRender.cmake
+    LLSharedLibs.cmake
     LLUI.cmake
     LLVFS.cmake
     LLWindow.cmake
@@ -81,6 +74,7 @@ set(cmake_SOURCE_FILES
     Linking.cmake
     MediaPluginBase.cmake
     NDOF.cmake
+    NVAPI.cmake
     OPENAL.cmake
     OpenGL.cmake
     OpenJPEG.cmake
@@ -90,17 +84,16 @@ set(cmake_SOURCE_FILES
     Prebuilt.cmake
     PulseAudio.cmake
     Python.cmake
-    Qt4.cmake
-    QuickTimePlugin.cmake
-    RunBuildTest.cmake
     StateMachine.cmake
     TemplateCheck.cmake
     Tut.cmake
     UI.cmake
     UnixInstall.cmake
+    URIPARSER.cmake
     Variables.cmake
     ViewerMiscLibs.cmake
-    WebKitLibPlugin.cmake
+    WinManifest.cmake
+    LibVLCPlugin.cmake
     XmlRpcEpi.cmake
     ZLIB.cmake
     )
@@ -109,7 +102,6 @@ source_group("Shared Rules" FILES ${cmake_SOURCE_FILES})
 
 set(master_SOURCE_FILES
     ../CMakeLists.txt
-    ../develop.py
     )
 
 source_group("Master Rules" FILES ${master_SOURCE_FILES})

indra/cmake/CURL.cmake

@@ -10,13 +10,11 @@ else (STANDALONE)
   use_prebuilt_binary(curl)
   if (WINDOWS)
     set(CURL_LIBRARIES 
-    debug libcurld
-    optimized libcurl)
+    debug libcurl_a_debug
+    optimized libcurl_a)
   else (WINDOWS)
-    set(CURL_LIBRARIES curl)
-    if(LINUX AND WORD_SIZE EQUAL 64)
-      list(APPEND CURL_LIBRARIES idn)
-    endif(LINUX AND WORD_SIZE EQUAL 64)
+    use_prebuilt_binary(libidn)
+    set(CURL_LIBRARIES curl idn)
   endif (WINDOWS)
-  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cmake/Colladadom.cmake

@@ -1,6 +1,7 @@
 # -*- cmake -*-
 
 include(Prebuilt)
+include(Boost)
 
 set(COLLADADOM_FIND_QUIETLY OFF)
 set(COLLADADOM_FIND_REQUIRED ON)
@@ -9,32 +10,22 @@ if (STANDALONE)
   include (FindColladadom)
 else (STANDALONE)
   use_prebuilt_binary(colladadom)
-
-  if (NOT WINDOWS AND NOT LINUX)
-	use_prebuilt_binary(pcre)
-  endif (NOT WINDOWS AND NOT LINUX)
-
-  if (NOT DARWIN AND NOT WINDOWS)
-	use_prebuilt_binary(libxml)
-  endif (NOT DARWIN AND NOT WINDOWS)
-
   set(COLLADADOM_INCLUDE_DIRS
-	  ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/collada
-	  ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/collada/1.4
-	  )
+      ${LIBS_PREBUILT_DIR}/include/collada
+      ${LIBS_PREBUILT_DIR}/include/collada/1.4
+      )
 
   if (WINDOWS)
-	  add_definitions(-DDOM_DYNAMIC)
-	  set(COLLADADOM_LIBRARIES 
-		  debug libcollada14dom22-d
-		  optimized libcollada14dom22
-		  )
-  else (WINDOWS)
-	  set(COLLADADOM_LIBRARIES 
-		  collada14dom
-		  minizip
-		  xml2
-		  )
+    set(COLLADADOM_LIBRARIES
+        debug libcollada14dom23-sd
+        optimized libcollada14dom23-s
+        )
+  else(WINDOWS)
+    set(COLLADADOM_LIBRARIES
+        debug collada14dom-d
+        optimized collada14dom
+        minizip
+        )
   endif (WINDOWS)
 endif (STANDALONE)
 

indra/cmake/ConfigurePkgConfig.cmake

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

indra/cmake/Copy3rdPartyLibs.cmake

@@ -0,0 +1,255 @@
+# -*- cmake -*-
+
+# The copy_win_libs folder contains file lists and a script used to
+# copy dlls, exes and such needed to run the SecondLife from within
+# VisualStudio.
+
+include(CMakeCopyIfDifferent)
+include(Linking)
+include(Variables)
+include(LLCommon)
+
+###################################################################
+# set up platform specific lists of files that need to be copied
+###################################################################
+if(WINDOWS)
+    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")
+
+    #*******************************
+    # VIVOX - *NOTE: no debug version
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(vivox_files
+        SLVoice.exe
+        vivoxplatform.dll
+        )
+    if (ADDRESS_SIZE EQUAL 64)
+        list(APPEND vivox_files
+            vivoxsdk_x64.dll
+            ortp_x64.dll
+            )
+    else (ADDRESS_SIZE EQUAL 64)
+        list(APPEND vivox_files
+            vivoxsdk.dll
+            ortp.dll
+            )
+    endif (ADDRESS_SIZE EQUAL 64)
+
+    #*******************************
+    # Misc shared libs 
+
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
+    set(debug_files
+        libapr-1.dll
+        libaprutil-1.dll
+        libapriconv-1.dll
+        glod.dll    
+        libhunspell.dll
+        )
+
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(release_files
+        libapr-1.dll
+        libaprutil-1.dll
+        libapriconv-1.dll
+        glod.dll
+        libhunspell.dll
+        )
+
+    if(ADDRESS_SIZE EQUAL 64)
+      list(APPEND debug_files
+           libcrypto-1_1-x64.dll
+           libssl-1_1-x64.dll
+           )
+      list(APPEND release_files
+           libcrypto-1_1-x64.dll
+           libssl-1_1-x64.dll
+           )
+    else(ADDRESS_SIZE EQUAL 64)
+      list(APPEND debug_files
+           libcrypto-1_1.dll
+           libssl-1_1.dll
+           )
+      list(APPEND release_files
+           libcrypto-1_1.dll
+           libssl-1_1.dll
+           )
+    endif(ADDRESS_SIZE EQUAL 64)
+		
+    if(NOT DISABLE_TCMALLOC)
+      list(APPEND debug_files libtcmalloc_minimal-debug.dll)
+      list(APPEND release_files libtcmalloc_minimal.dll)
+    endif(NOT DISABLE_TCMALLOC)
+
+    if(OPENAL)
+      list(APPEND debug_files alut.dll OpenAL32.dll)
+      list(APPEND release_files alut.dll OpenAL32.dll)
+    endif(OPENAL)
+
+    if (USE_FMODSTUDIO)
+      list(APPEND debug_files fmodL.dll)
+      list(APPEND release_files fmod.dll)
+    endif (USE_FMODSTUDIO)
+
+elseif(DARWIN)
+    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
+    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
+    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
+
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(vivox_files
+        SLVoice
+        ca-bundle.crt
+        libsndfile.dylib
+        libvivoxoal.dylib
+        libortp.dylib
+        libvivoxplatform.dylib
+        libvivoxsdk.dylib
+       )
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
+    set(debug_files
+       )
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(release_files
+        libapr-1.0.dylib
+        libapr-1.dylib
+        libaprutil-1.0.dylib
+        libaprutil-1.dylib
+        libexception_handler.dylib
+        libexpat.1.5.2.dylib
+        libexpat.dylib
+        libGLOD.dylib
+        libhunspell-1.3.0.dylib
+        libndofdev.dylib
+       )
+
+    if (USE_FMODSTUDIO)
+      list(APPEND debug_files libfmodL.dylib)
+      list(APPEND release_files libfmod.dylib)
+    endif (USE_FMODSTUDIO)
+
+elseif(LINUX)
+    # linux is weird, multiple side by side configurations aren't supported
+    # and we don't seem to have any debug shared libs built yet anyways...
+    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}")
+    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
+    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
+
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    set(vivox_files
+        libsndfile.so.1
+        libortp.so
+        libvivoxoal.so.1
+        libvivoxplatform.so
+        libvivoxsdk.so
+        SLVoice
+       )
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
+    set(debug_files
+       )
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
+    # *FIX - figure out what to do with duplicate libalut.so here -brad
+    set(release_files
+        libapr-1.so.0
+        libaprutil-1.so.0
+        libexpat.so
+        libexpat.so.1
+        libGLOD.so
+        libopenal.so
+       )
+
+    if (USE_TCMALLOC)
+      list(APPEND release_files "libtcmalloc_minimal.so")
+    endif (USE_TCMALLOC)
+
+    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...")
+    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
+    set(vivox_files "")
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib/debug")
+    set(debug_files "")
+    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    # or ARCH_PREBUILT_DIRS
+    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib/release")
+    set(release_files "")
+
+    set(debug_llkdu_src "")
+    set(debug_llkdu_dst "")
+    set(release_llkdu_src "")
+    set(release_llkdu_dst "")
+    set(relwithdebinfo_llkdu_dst "")
+endif(WINDOWS)
+
+
+################################################################
+# Done building the file lists, now set up the copy commands.
+################################################################
+
+copy_if_different(
+    ${vivox_src_dir}
+    "${SHARED_LIB_STAGING_DIR_DEBUG}"
+    out_targets 
+    ${vivox_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELEASE}"
+    out_targets
+    ${vivox_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+copy_if_different(
+    ${vivox_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+    out_targets
+    ${vivox_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+
+
+#copy_if_different(
+#    ${debug_src_dir}
+#    "${SHARED_LIB_STAGING_DIR_DEBUG}"
+#    out_targets
+#    ${debug_files}
+#    )
+#set(third_party_targets ${third_party_targets} ${out_targets})
+
+copy_if_different(
+    ${release_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELEASE}"
+    out_targets
+    ${release_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+copy_if_different(
+    ${release_src_dir}
+    "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+    out_targets
+    ${release_files}
+    )
+set(third_party_targets ${third_party_targets} ${out_targets})
+
+if(NOT USESYSTEMLIBS)
+  add_custom_target(
+      stage_third_party_libs ALL
+      DEPENDS ${third_party_targets}
+      )
+endif(NOT USESYSTEMLIBS)

indra/cmake/CopyBackToSource.cmake

@@ -1,16 +0,0 @@
-# -*- cmake -*-
-# Copies a binary back to the source directory
-
-MACRO(COPY_BACK_TO_SOURCE target)
-   GET_TARGET_PROPERTY(FROM ${target} LOCATION)
-   SET(TO ${CMAKE_CURRENT_SOURCE_DIR})
-   #MESSAGE("TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${FROM} ${TO}")
-   ADD_CUSTOM_COMMAND(
-        TARGET ${target} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy ${FROM} ${TO}
-        DEPENDS ${FROM}
-        COMMENT "Copying ${target} to ${CMAKE_CURRENT_BINARY_DIR}"
-        )
-ENDMACRO(COPY_BACK_TO_SOURCE)
-
-

indra/cmake/CopyWinLibs.cmake

@@ -1,317 +0,0 @@
-# -*- cmake -*-
-
-# The copy_win_libs folder contains file lists and a script used to 
-# copy dlls, exes and such needed to run the SecondLife from within 
-# VisualStudio. 
-
-include(CMakeCopyIfDifferent)
-
-if(WORD_SIZE EQUAL 32)
-    set(debug_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
-    set(release_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
-else(WORD_SIZE EQUAL 32)
-    set(debug_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/x86_64-win/lib/debug")
-    set(release_libs_dir "${CMAKE_SOURCE_DIR}/../libraries/x86_64-win/lib/release")
-endif(WORD_SIZE EQUAL 32)
-
-set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
-set(vivox_files
-    SLVoice.exe
-    alut.dll
-    vivoxsdk.dll
-    ortp.dll
-    wrap_oal.dll
-    )
-copy_if_different(
-    ${vivox_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-    out_targets
-    ${vivox_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-
-set(debug_src_dir "${debug_libs_dir}")
-set(debug_files
-    libhunspell.dll
-    libapr-1.dll
-    libaprutil-1.dll
-    libapriconv-1.dll
-    libeay32.dll
-    ssleay32.dll
-    libcollada14dom22-d.dll
-    glod.dll
-    )
-
-copy_if_different(
-    ${debug_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug"
-    out_targets 
-    ${debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Debug config runtime files required for the plugin test mule
-set(plugintest_debug_src_dir "${debug_libs_dir}")
-set(plugintest_debug_files
-    libeay32.dll
-    qtcored4.dll
-    qtguid4.dll
-    qtnetworkd4.dll
-    qtopengld4.dll
-    qtwebkitd4.dll
-    ssleay32.dll
-    )
-copy_if_different(
-    ${plugintest_debug_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug"
-    out_targets
-    ${plugintest_debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Debug config runtime files required for the plugin test mule (Qt image format plugins)
-set(plugintest_debug_src_dir "${debug_libs_dir}/imageformats")
-set(plugintest_debug_files
-    qgifd4.dll
-    qicod4.dll
-    qjpegd4.dll
-    qmngd4.dll
-    qsvgd4.dll
-    qtiffd4.dll
-    )
-copy_if_different(
-    ${plugintest_debug_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Debug/imageformats"
-    out_targets
-    ${plugintest_debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_debug_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/llplugin/imageformats"
-    out_targets
-    ${plugintest_debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Release & ReleaseDebInfo config runtime files required for the plugin test mule
-set(plugintest_release_src_dir "${release_libs_dir}")
-set(plugintest_release_files
-    libeay32.dll
-    qtcore4.dll
-    qtgui4.dll
-    qtnetwork4.dll
-    qtopengl4.dll
-    qtwebkit4.dll
-    ssleay32.dll
-    )
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Release & ReleaseDebInfo config runtime files required for the plugin test mule (Qt image format plugins)
-set(plugintest_release_src_dir "${release_libs_dir}/imageformats")
-set(plugintest_release_files
-    qgif4.dll
-    qico4.dll
-    qjpeg4.dll
-    qmng4.dll
-    qsvg4.dll
-    qtiff4.dll
-    )
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/Release/imageformats"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/../test_apps/llplugintest/RelWithDebInfo/imageformats"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin/imageformats"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugintest_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin/imageformats"
-    out_targets
-    ${plugintest_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Debug config runtime files required for the plugins
-set(plugins_debug_src_dir "${debug_libs_dir}")
-set(plugins_debug_files
-    libeay32.dll
-    qtcored4.dll
-    qtguid4.dll
-    qtnetworkd4.dll
-    qtopengld4.dll
-    qtwebkitd4.dll
-    ssleay32.dll
-    )
-copy_if_different(
-    ${plugins_debug_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/Debug/llplugin"
-    out_targets
-    ${plugins_debug_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-# Release & ReleaseDebInfo config runtime files required for the plugins
-set(plugins_release_src_dir "${release_libs_dir}")
-set(plugins_release_files
-    libeay32.dll
-    qtcore4.dll
-    qtgui4.dll
-    qtnetwork4.dll
-    qtopengl4.dll
-    qtwebkit4.dll
-    ssleay32.dll
-    )
-copy_if_different(
-    ${plugins_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/Release/llplugin"
-    out_targets
-    ${plugins_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${plugins_release_src_dir}
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/llplugin"
-    out_targets
-    ${plugins_release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-
-set(release_src_dir "${release_libs_dir}")
-set(release_files
-    libhunspell.dll
-    libapr-1.dll
-    libaprutil-1.dll
-    libapriconv-1.dll
-    libeay32.dll
-    ssleay32.dll
-    libcollada14dom22.dll
-    glod.dll
-    )
-
-if(WORD_SIZE EQUAL 32)
-    set(release_files ${release_files}
-    libtcmalloc_minimal.dll
-    )
-endif(WORD_SIZE EQUAL 32)
-
-
-if(FMODEX)
-    if (WORD_SIZE EQUAL 32)
-        set(fmodex_dll_file "fmodex.dll")
-    else (WORD_SIZE EQUAL 32)
-        set(fmodex_dll_file "fmodex64.dll")
-    endif (WORD_SIZE EQUAL 32)
-    
-    find_path(FMODEX_BINARY_DIR "${fmodex_dll_file}"
-          "${release_src_dir}"
-          "${FMODEX_SDK_DIR}/api"
-          "${FMODEX_SDK_DIR}"
-          NO_DEFAULT_PATH
-          )
-
-    if(FMODEX_BINARY_DIR)
-        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets "${fmodex_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets "${fmodex_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-        copy_if_different("${FMODEX_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets "${fmodex_dll_file}")
-        set(all_targets ${all_targets} ${out_targets})
-    endif(FMODEX_BINARY_DIR)
-endif(FMODEX)
-
-if(FMOD)
-    find_path(FMOD_BINARY_DIR fmod.dll
-          ${release_src_dir}
-          ${FMOD_SDK_DIR}/api
-          ${FMOD_SDK_DIR}
-          )
-
-if(FMOD_BINARY_DIR)
-    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Release" out_targets fmod.dll)
-    set(all_targets ${all_targets} ${out_targets})
-    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo" out_targets fmod.dll)
-    set(all_targets ${all_targets} ${out_targets})
-    copy_if_different("${FMOD_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/Debug" out_targets fmod.dll)
-    set(all_targets ${all_targets} ${out_targets})
-    else(FMOD_BINARY_DIR)
-        list(APPEND release_files fmod.dll)	#Required for compile. This will cause an error in copying binaries.
-    endif(FMOD_BINARY_DIR)
-endif(FMOD)
-    
-copy_if_different(
-    ${release_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Release"
-    out_targets 
-    ${release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${vivox_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/Release"
-    out_targets 
-    ${vivox_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${release_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-    out_targets 
-    ${release_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-copy_if_different(
-    ${vivox_src_dir} 
-    "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo"
-    out_targets 
-    ${vivox_files}
-    )
-set(all_targets ${all_targets} ${out_targets})
-
-add_custom_target(copy_win_libs ALL
-  DEPENDS 
-    ${all_targets}
-    ${release_appconfig_file} 
-    ${relwithdebinfo_appconfig_file} 
-    ${debug_appconfig_file}
-  )
-add_dependencies(copy_win_libs prepare)
-

indra/cmake/CrashPad.cmake

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

indra/cmake/DBusGlib.cmake

@@ -1,24 +1,11 @@
 # -*- cmake -*-
-include(Prebuilt)
 
-if (STANDALONE)
+if (LINUX)
   include(FindPkgConfig)
 
   pkg_check_modules(DBUSGLIB REQUIRED dbus-glib-1)
 
-elseif (LINUX)
-  use_prebuilt_binary(dbusglib)
-  set(DBUSGLIB_FOUND ON FORCE BOOL)
-  set(DBUSGLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/dbus
-      )
-  # We don't need to explicitly link against dbus-glib itself, because
-  # the viewer probes for the system's copy at runtime.
-  set(DBUSGLIB_LIBRARIES
-      gobject-2.0
-      glib-2.0
-      )
-endif (STANDALONE)
+endif (LINUX)
 
 if (DBUSGLIB_FOUND)
   set(DBUSGLIB ON CACHE BOOL "Build with dbus-glib message bus support.")

indra/cmake/DeploySharedLibs.cmake

@@ -0,0 +1,70 @@
+# DeploySharedLibs.cmake
+# This is a script to be run at build time! Its not part of the cmake configuration!
+# See indra/cmake/LLSharedLibs.cmake for a macro that simplifies adding a command to a target to run this script.
+
+# This  script requires a few cmake variable to be set on the command line:
+# BIN_NAME= The full path the the binary to search for dependecies.
+# SEARCH_DIRS= The full paths to dirs to search for dependencies.
+# DST_PATH= The full path where the dependecies will be copied.
+get_filename_component(current_dir ${CMAKE_CURRENT_LIST_FILE} PATH)
+include(GetPrerequisites)
+
+message("Getting recursive dependencies for file: ${BIN_NAME}")
+
+set(EXCLUDE_SYSTEM 1)
+set(RECURSE 0)
+get_filename_component(EXE_PATH ${BIN_NAME} PATH)
+
+get_prerequisites( ${BIN_NAME} RESULTS ${EXCLUDE_SYSTEM} ${RECURSE} "${EXE_PATH}" "${SEARCH_DIRS}" )
+
+foreach(DEP ${RESULTS})
+  Message("Processing dependency: ${DEP}")
+  get_filename_component(DEP_FILE ${DEP} NAME)
+  set(DEP_FILES ${DEP_FILES} ${DEP_FILE})
+endforeach(DEP)
+
+if(DEP_FILES)
+  list(REMOVE_DUPLICATES DEP_FILES)
+endif(DEP_FILES)
+
+foreach(DEP_FILE ${DEP_FILES})
+  if(FOUND_FILES)
+    list(FIND FOUND_FILES ${DEP_FILE} FOUND)
+  else(FOUND_FILES)
+    set(FOUND -1)
+  endif(FOUND_FILES)
+
+  if(FOUND EQUAL -1)
+    find_path(DEP_PATH ${DEP_FILE} PATHS ${SEARCH_DIRS} NO_DEFAULT_PATH)
+    if(DEP_PATH)
+      set(FOUND_FILES ${FOUND_FILES} "${DEP_PATH}/${DEP_FILE}")
+      set(DEP_PATH NOTFOUND) #reset DEP_PATH for the next find_path call.
+    else(DEP_PATH)
+      set(MISSING_FILES ${MISSING_FILES} ${DEP_FILE})
+    endif(DEP_PATH)
+  endif(FOUND EQUAL -1)
+endforeach(DEP_FILE)
+
+if(MISSING_FILES)
+  message("Missing:")
+  foreach(FILE ${MISSING_FILES})
+    message("  ${FILE}")
+  endforeach(FILE)
+  message("Searched in:")
+  foreach(SEARCH_DIR ${SEARCH_DIRS})
+    message("  ${SEARCH_DIR}")
+  endforeach(SEARCH_DIR)
+  message(FATAL_ERROR "Failed")
+endif(MISSING_FILES)
+
+if(FOUND_FILES)
+  foreach(FILE ${FOUND_FILES})
+    get_filename_component(DST_FILE ${FILE} NAME)
+    set(DST_FILE "${DST_PATH}/${DST_FILE}")
+    message("Copying ${FILE} to ${DST_FILE}")
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${FILE} ${DST_FILE}
+      )
+  endforeach(FILE ${FOUND_FILES})
+endif(FOUND_FILES)
+message("Success!")

indra/cmake/DirectX.cmake

@@ -1,75 +0,0 @@
-# -*- cmake -*-
-
-include(Variables)
-
-if (WINDOWS)
-  if (WORD_SIZE EQUAL 32)
-    set (DIRECTX_ARCHITECTURE x86)
-  elseif (WORD_SIZE EQUAL 64)
-    set (DIRECTX_ARCHITECTURE x64)
-  else (WORD_SIZE EQUAL 32)
-    set (DIRECTX_ARCHITECTURE x86)
-  endif (WORD_SIZE EQUAL 32)
-
-  find_path(DIRECTX_ROOT_DIR Include/dxdiag.h
-            PATHS
-            "$ENV{DXSDK_DIR}"
-            "$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2010)"
-            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2010)"
-            "$ENV{ProgramFiles}/Microsoft DirectX SDK (February 2010)"
-            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (February 2010)"
-            "$ENV{ProgramFiles}/Microsoft DirectX SDK (March 2009)"
-            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2009)"
-            "$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2008)"
-            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2008)"
-            "$ENV{ProgramFiles}/Microsoft DirectX SDK (June 2008)"
-            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (June 2008)"
-            "$ENV{ProgramFiles}/Microsoft DirectX SDK (March 2008)"
-            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (March 2008)"
-            "$ENV{ProgramFiles}/Microsoft DirectX SDK (November 2007)"
-            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (November 2007)"
-            "$ENV{ProgramFiles}/Microsoft DirectX SDK (August 2007)"
-            "$ENV{ProgramFiles(x86)}/Microsoft DirectX SDK (August 2007)"
-            )
-
-  if (DIRECTX_ROOT_DIR)
-    set (DIRECTX_INCLUDE_DIR "${DIRECTX_ROOT_DIR}/Include")
-    set (DIRECTX_LIBRARY_DIR "${DIRECTX_ROOT_DIR}/Lib/${DIRECTX_ARCHITECTURE}")
-  else (DIRECTX_ROOT_DIR)
-    find_path (WIN_KIT_ROOT_DIR Include/um/windows.h
-               PATHS
-               "$ENV{ProgramFiles}/Windows Kits/8.1"
-               "$ENV{ProgramFiles(x86)}/Windows Kits/8.1"
-               "$ENV{ProgramFiles}/Windows Kits/8.0"
-               "$ENV{ProgramFiles(x86)}/Windows Kits/8.0"
-               )
-
-    find_path (WIN_KIT_LIB_DIR dxguid.lib
-               "${WIN_KIT_ROOT_DIR}/Lib/winv6.3/um/${DIRECTX_ARCHITECTURE}"
-               "${WIN_KIT_ROOT_DIR}/Lib/Win8/um/${DIRECTX_ARCHITECTURE}"
-               )
-
-    if (WIN_KIT_ROOT_DIR AND WIN_KIT_LIB_DIR)
-      set (DIRECTX_INCLUDE_DIR "${WIN_KIT_ROOT_DIR}/Include/um" "${WIN_KIT_ROOT_DIR}/Include/shared")
-      set (DIRECTX_LIBRARY_DIR "${WIN_KIT_LIB_DIR}")
-    endif (WIN_KIT_ROOT_DIR AND WIN_KIT_LIB_DIR)
-  endif (DIRECTX_ROOT_DIR)
-
-  if (DIRECTX_INCLUDE_DIR)
-    include_directories(${DIRECTX_INCLUDE_DIR})
-    if (DIRECTX_FIND_QUIETLY)
-      message(STATUS "Found DirectX include: ${DIRECTX_INCLUDE_DIR}")
-    endif (DIRECTX_FIND_QUIETLY)
-  else (DIRECTX_INCLUDE_DIR)
-    message(FATAL_ERROR "Could not find DirectX SDK Include")
-  endif (DIRECTX_INCLUDE_DIR)
-
-  if (DIRECTX_LIBRARY_DIR)
-    if (DIRECTX_FIND_QUIETLY)
-      message(STATUS "Found DirectX include: ${DIRECTX_LIBRARY_DIR}")
-    endif (DIRECTX_FIND_QUIETLY)
-  else (DIRECTX_LIBRARY_DIR)
-    message(FATAL_ERROR "Could not find DirectX SDK Libraries")
-  endif (DIRECTX_LIBRARY_DIR)
-
-endif (WINDOWS)

indra/cmake/DownloadPrebuilt.cmake.in

@@ -1,45 +0,0 @@
-# This script drives download of prebuilt packages during the build.
-# The top-level CMakeLists.txt configures packages and tool locations.
-set(packages "@PREBUILT_PACKAGES@")
-set(python "@PYTHON_EXECUTABLE@")
-set(install_dir "@CMAKE_SOURCE_DIR@/..")
-set(scp "@SCP_EXECUTABLE@")
-set(scripts_dir "@SCRIPTS_DIR@")
-set(sentinel_dir "@CMAKE_BINARY_DIR@/prepare")
-set(prebuilt_type "@PREBUILT_TYPE@")
-
-# In proprietary mode we use scp for download.
-set(proprietary "@INSTALL_PROPRIETARY@")
-if(proprietary)
-  set(scp_option "--scp=${scp}")
-  set(proprietary_message " proprietary")
-endif(proprietary)
-
-foreach(package ${packages})
-  if(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
-    # This package is missing or out of date.
-    message(STATUS "Obtaining${proprietary_message} prebuilt '${package}'")
-    execute_process(
-      COMMAND ${python} install.py -p${prebuilt_type} --install-dir=${install_dir} ${scp_option} ${package}
-      WORKING_DIRECTORY ${scripts_dir}
-      RESULT_VARIABLE result
-      )
-    if(result STREQUAL 0)
-      # Write a sentinel to avoid attempting a download again.
-      file(WRITE ${sentinel_dir}/${package}_installed "Obtained '${package}'")
-    else(result STREQUAL 0)
-      # Remove the sentinel to ensure a download is attempted again.
-      file(REMOVE ${sentinel_dir}/prebuilt
-                  ${sentinel_dir}/${package}_installed)
-      message(FATAL_ERROR
-        "Failed to download or unpack prebuilt '${package}'.  "
-        "Process returned: ${result}")
-    endif(result STREQUAL 0)
-  else(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
-    # This package is ready.
-    message(STATUS "Prebuilt '${package}' is up-to-date")
-  endif(${install_dir}/install.xml IS_NEWER_THAN ${sentinel_dir}/${package}_installed)
-endforeach(package)
-
-# Store a sentinel to avoid running this script unnecessarily.
-file(WRITE ${sentinel_dir}/prebuilt "All prebuilts obtained successfully\n")

indra/cmake/ELFIO.cmake

@@ -1,19 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-set(ELFIO_FIND_QUIETLY ON)
-
-if (STANDALONE)
-  include(FindELFIO)
-elseif (LINUX)
-  use_prebuilt_binary(elfio)
-  set(ELFIO_LIBRARIES ELFIO)
-  set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-  set(ELFIO_FOUND "YES")
-endif (STANDALONE)
-
-if (ELFIO_FOUND)
-  add_definitions(-DLL_ELFBIN=1)
-else (ELFIO_FOUND)
-  set(ELFIO_INCLUDE_DIR "")
-endif (ELFIO_FOUND)

indra/cmake/EXPAT.cmake

@@ -9,9 +9,9 @@ if (STANDALONE)
 else (STANDALONE)
     use_prebuilt_binary(expat)
     if (WINDOWS)
-        set(EXPAT_LIBRARIES libexpatMT)
+        set(EXPAT_LIBRARIES expat)
     else (WINDOWS)
         set(EXPAT_LIBRARIES expat)
     endif (WINDOWS)
-    set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    set(EXPAT_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cmake/FMOD.cmake

@@ -1,52 +0,0 @@
-# -*- cmake -*-
-
-include(Linking)
-
-if(INSTALL_PROPRIETARY)
-  include(Prebuilt)
-  use_prebuilt_binary(fmod)
-endif(INSTALL_PROPRIETARY)
-
-find_library(FMOD_LIBRARY
-             NAMES fmod fmodvc fmod-3.75
-             PATHS
-             optimized ${ARCH_PREBUILT_DIRS_RELEASE}
-             debug ${ARCH_PREBUILT_DIRS_DEBUG}
-             )
-
-if (NOT FMOD_LIBRARY)
-  set(FMOD_SDK_DIR CACHE PATH "Path to the FMOD SDK.")
-  if (FMOD_SDK_DIR)
-    find_library(FMOD_LIBRARY
-                 NAMES fmodvc fmod-3.75 fmod
-                 PATHS
-                 ${FMOD_SDK_DIR}/api/lib
-                 ${FMOD_SDK_DIR}/api
-                 ${FMOD_SDK_DIR}/lib
-                 ${FMOD_SDK_DIR}
-                 )
-  endif (FMOD_SDK_DIR)
-endif (NOT FMOD_LIBRARY)
-
-find_path(FMOD_INCLUDE_DIR fmod.h
-          ${LIBS_PREBUILT_DIR}/include
-          ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
-          ${FMOD_SDK_DIR}/api/inc
-          ${FMOD_SDK_DIR}/inc
-          ${FMOD_SDK_DIR}
-          )
-
-if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
-  set(FMOD ON CACHE BOOL "Use closed source FMOD sound library.")
-else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
-  set(FMOD_LIBRARY "")
-  set(FMOD_INCLUDE_DIR "")
-  if (FMOD)
-    message(STATUS "No support for FMOD audio (need to set FMOD_SDK_DIR?)")
-  endif (FMOD)
-  set(FMOD OFF CACHE BOOL "Use closed source FMOD sound library.")
-endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
-
-if (FMOD)
-  message(STATUS "Building with FMOD audio support")
-endif (FMOD)

indra/cmake/FMODEX.cmake

@@ -1,82 +0,0 @@
-# -*- cmake -*-
-
-include(Linking)
-
-if (NOT FMODEX_LIBRARY)
-  set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
-  if (FMODEX_SDK_DIR)
-    if(WORD_SIZE EQUAL 32)
-      find_library(FMODEX_LIBRARY
-                   fmodex_vc fmodexL_vc fmodex fmodexL
-                   PATHS
-                   "${FMODEX_SDK_DIR}/api/lib"
-                   "${FMODEX_SDK_DIR}/api"
-                   "${FMODEX_SDK_DIR}/lib"
-                   "${FMODEX_SDK_DIR}"
-                   )
-    elseif(WORD_SIZE EQUAL 64)
-      find_library(FMODEX_LIBRARY
-                   fmodex64_vc fmodexL64_vc fmodex64 fmodexL64
-                   PATHS
-                   "${FMODEX_SDK_DIR}/api/lib"
-                   "${FMODEX_SDK_DIR}/api"
-                   "${FMODEX_SDK_DIR}/lib"
-                   "${FMODEX_SDK_DIR}"
-                   )
-    endif(WORD_SIZE EQUAL 32)
-  endif(FMODEX_SDK_DIR)
-  if(WINDOWS AND NOT FMODEX_SDK_DIR)
-    GET_FILENAME_COMPONENT(FMODEX_PROG_DIR [HKEY_CURRENT_USER\\Software\\FMOD\ Programmers\ API\ Windows] ABSOLUTE CACHE)
-    if(WORD_SIZE EQUAL 32)
-      find_library(FMODEX_LIBRARY
-                   fmodex_vc fmodexL_vc
-                   PATHS
-                   "${FMODEX_PROG_DIR}/api/lib"
-                   "${FMODEX_PROG_DIR}/api"
-                   "${FMODEX_PROG_DIR}"
-                   )
-    else(WORD_SIZE EQUAL 32)
-      find_library(FMODEX_LIBRARY
-                   fmodex64_vc fmodexL64_vc
-                   PATHS
-                   "${FMODEX_PROG_DIR}/api/lib"
-                   "${FMODEX_PROG_DIR}/api"
-                   "${FMODEX_PROG_DIR}"
-                   )
-    endif(WORD_SIZE EQUAL 32)
-    if(FMODEX_LIBRARY)
-      message(STATUS "Found fmodex in ${FMODEX_PROG_DIR}")
-      set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}")
-      set(FMODEX_SDK_DIR "${FMODEX_PROG_DIR}" CACHE PATH "Path to the FMOD Ex SDK." FORCE)
-    endif(FMODEX_LIBRARY)
-  endif(WINDOWS AND NOT FMODEX_SDK_DIR)
-endif (NOT FMODEX_LIBRARY)
-
-find_path(FMODEX_INCLUDE_DIR fmod.hpp
-          "${LIBS_PREBUILT_DIR}/include/fmodex"
-          "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/fmodex"
-          "${FMODEX_SDK_DIR}/api/inc"
-          "${FMODEX_SDK_DIR}/inc"
-          "${FMODEX_SDK_DIR}"
-          )
-
-if(DARWIN)
-  set(FMODEX_ORIG_LIBRARY "${FMODEX_LIBRARY}")
-  set(FMODEX_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/libfmodex.dylib")
-endif(DARWIN)
-
-if (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
-  set(FMODEX ON CACHE BOOL "Use closed source FMOD Ex sound library.")
-else (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
-  set(FMODEX_LIBRARY "")
-  set(FMODEX_INCLUDE_DIR "")
-  if (FMODEX)
-    message(STATUS "No support for FMOD Ex audio (need to set FMODEX_SDK_DIR?)")
-  endif (FMODEX)
-  set(FMODEX OFF CACHE BOOL "Use closed source FMOD Ex sound library.")
-  set(FMODEX OFF)
-endif (FMODEX_LIBRARY AND FMODEX_INCLUDE_DIR)
-
-if (FMODEX)
-  message(STATUS "Building with FMOD Ex audio support")
-endif (FMODEX)

indra/cmake/FMODSTUDIO.cmake

@@ -0,0 +1,50 @@
+# -*- cmake -*-
+
+include(Variables)
+if (USE_FMODSTUDIO)
+  use_prebuilt_binary(fmodstudio)
+  if(WINDOWS)
+    set(lib_suffix .dll)
+  elseif(DARWIN)
+    set(lib_suffix .dylib)
+  else(WINDOWS)
+    set(lib_suffix .so)
+  endif(WINDOWS)
+  if(WINDOWS)
+    set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/fmod${lib_suffix})
+    set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/fmodL${lib_suffix})
+  else(WINDOWS)
+    set(FMOD_LIBRARY_RELEASE ${LIBS_PREBUILT_DIR}/lib/release/libfmod${lib_suffix})
+    set(FMOD_LIBRARY_DEBUG ${LIBS_PREBUILT_DIR}/lib/debug/libfmodL${lib_suffix})
+  endif(WINDOWS)
+  set(FMOD_LINK_LIBRARY_RELEASE ${FMOD_LIBRARY_RELEASE})
+  set(FMOD_LINK_LIBRARY_DEBUG ${FMOD_LIBRARY_DEBUG})
+
+  if(WINDOWS)
+    string(REPLACE ".dll" "_vc.lib" FMOD_LINK_LIBRARY_RELEASE ${FMOD_LIBRARY_RELEASE})
+    string(REPLACE ".dll" "_vc.lib" FMOD_LINK_LIBRARY_DEBUG ${FMOD_LIBRARY_DEBUG})
+  endif(WINDOWS)
+
+  set (FMOD_LIBRARY
+    debug ${FMOD_LINK_LIBRARY_DEBUG}
+    optimized ${FMOD_LINK_LIBRARY_RELEASE}
+    )
+
+  set(FMODSTUDIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio)
+endif(USE_FMODSTUDIO)
+
+if(FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
+  set(FMOD ON)
+  if (NOT FMOD_LIBRARY_DEBUG) #Use release library in debug configuration if debug library is absent.
+    set(FMOD_LIBRARY_DEBUG ${FMOD_LIBRARY_RELEASE})
+  endif (NOT FMOD_LIBRARY_DEBUG)
+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(USE_FMODSTUDIO OFF)
+endif (FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
+
+if (FMOD)
+  message(STATUS "Building with FMOD Studio audio support")
+endif (FMOD)
+

indra/cmake/FindAutobuild.cmake

@@ -0,0 +1,43 @@
+# -*- cmake -*-
+#
+# Find the autobuild tool
+#
+# Output variables:
+#
+#   AUTOBUILD_EXECUTABLE - path to autobuild executable
+
+
+
+IF (NOT AUTOBUILD_EXECUTABLE)
+
+  # If cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var
+  IF (DEFINED ENV{AUTOBUILD})
+    SET(AUTOBUILD_EXECUTABLE $ENV{AUTOBUILD})
+  ELSE (DEFINED ENV{AUTOBUILD})
+    IF(WIN32)
+      SET(AUTOBUILD_EXE_NAMES autobuild.exe autobuild.cmd)
+    ELSE(WIN32)
+      SET(AUTOBUILD_EXE_NAMES autobuild)
+    ENDIF(WIN32)
+
+    SET(AUTOBUILD_EXECUTABLE)
+    FIND_PROGRAM(
+      AUTOBUILD_EXECUTABLE 
+      NAMES ${AUTOBUILD_EXE_NAMES}
+      PATHS 
+        ENV PATH
+        ${CMAKE_SOURCE_DIR}/.. 
+        ${CMAKE_SOURCE_DIR}/../..
+        ${CMAKE_SOURCE_DIR}/../../..
+      PATH_SUFFIXES "/autobuild/bin/"
+    )
+  ENDIF (DEFINED ENV{AUTOBUILD})
+
+  IF (NOT AUTOBUILD_EXECUTABLE)
+    IF (AUTOBUILD_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find autobuild executable")
+    ENDIF (AUTOBUILD_FIND_REQUIRED)
+  ENDIF (NOT AUTOBUILD_EXECUTABLE)
+
+  MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE)
+ENDIF (NOT AUTOBUILD_EXECUTABLE)

indra/cmake/FindBerkeleyDB.cmake

@@ -1,50 +0,0 @@
-# -*- cmake -*-
-
-# - Find BerkeleyDB
-# Find the BerkeleyDB includes and library
-# This module defines
-#  DB_INCLUDE_DIR, where to find db.h, etc.
-#  DB_LIBRARIES, the libraries needed to use BerkeleyDB.
-#  DB_FOUND, If false, do not try to use BerkeleyDB.
-# also defined, but not for general use are
-#  DB_LIBRARY, where to find the BerkeleyDB library.
-
-FIND_PATH(DB_INCLUDE_DIR db.h
-/usr/local/include/db4
-/usr/local/include
-/usr/include/db4
-/usr/include
-)
-
-SET(DB_NAMES ${DB_NAMES} db)
-FIND_LIBRARY(DB_LIBRARY
-  NAMES ${DB_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (DB_LIBRARY AND DB_INCLUDE_DIR)
-    SET(DB_LIBRARIES ${DB_LIBRARY})
-    SET(DB_FOUND "YES")
-ELSE (DB_LIBRARY AND DB_INCLUDE_DIR)
-  SET(DB_FOUND "NO")
-ENDIF (DB_LIBRARY AND DB_INCLUDE_DIR)
-
-
-IF (DB_FOUND)
-   IF (NOT DB_FIND_QUIETLY)
-      MESSAGE(STATUS "Found BerkeleyDB: ${DB_LIBRARIES}")
-   ENDIF (NOT DB_FIND_QUIETLY)
-ELSE (DB_FOUND)
-   IF (DB_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find BerkeleyDB library")
-   ENDIF (DB_FIND_REQUIRED)
-ENDIF (DB_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_DB_INCLUDE_PATH ${DB_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_DB_LIB_PATH ${DB_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  DB_LIBRARY
-  DB_INCLUDE_DIR
-  )

indra/cmake/FindELFIO.cmake

@@ -1,48 +0,0 @@
-# -*- cmake -*-
-
-# - Find ELFIO
-# Find the ELFIO includes and library
-# This module defines
-#  ELFIO_INCLUDE_DIR, where to find elfio.h, etc.
-#  ELFIO_LIBRARIES, the libraries needed to use ELFIO.
-#  ELFIO_FOUND, If false, do not try to use ELFIO.
-# also defined, but not for general use are
-#  ELFIO_LIBRARY, where to find the ELFIO library.
-
-FIND_PATH(ELFIO_INCLUDE_DIR ELFIO/ELFIO.h
-/usr/local/include
-/usr/include
-)
-
-SET(ELFIO_NAMES ${ELFIO_NAMES} ELFIO)
-FIND_LIBRARY(ELFIO_LIBRARY
-  NAMES ${ELFIO_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
-    SET(ELFIO_LIBRARIES ${ELFIO_LIBRARY})
-    SET(ELFIO_FOUND "YES")
-ELSE (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
-  SET(ELFIO_FOUND "NO")
-ENDIF (ELFIO_LIBRARY AND ELFIO_INCLUDE_DIR)
-
-
-IF (ELFIO_FOUND)
-   IF (NOT ELFIO_FIND_QUIETLY)
-      MESSAGE(STATUS "Found ELFIO: ${ELFIO_LIBRARIES}")
-   ENDIF (NOT ELFIO_FIND_QUIETLY)
-ELSE (ELFIO_FOUND)
-   IF (ELFIO_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find ELFIO library")
-   ENDIF (ELFIO_FIND_REQUIRED)
-ENDIF (ELFIO_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_ELFIO_INCLUDE_PATH ${ELFIO_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_ELFIO_LIB_PATH ${ELFIO_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  ELFIO_LIBRARY
-  ELFIO_INCLUDE_DIR
-  )

indra/cmake/FindGoogleBreakpad.cmake

@@ -1,40 +0,0 @@
-# -*- cmake -*-
-
-# - Find Google BreakPad
-# Find the Google BreakPad includes and library
-# This module defines
-#  BREAKPAD_INCLUDE_DIRECTORIES, where to find the Goole BreakPad includes.
-#  BREAKPAD_EXCEPTION_HANDLER_LIBRARIES, the libraries needed to use Google BreakPad.
-#  BREAKPAD_EXCEPTION_HANDLER_FOUND, If false, do not try to use Google BreakPad.
-# also defined, but not for general use are
-#  BREAKPAD_EXCEPTION_HANDLER_LIBRARY, where to find the Google BreakPad library.
-
-FIND_PATH(BREAKPAD_INCLUDE_DIRECTORIES common/using_std_string.h PATH_SUFFIXES google_breakpad)
-
-SET(BREAKPAD_EXCEPTION_HANDLER_NAMES ${BREAKPAD_EXCEPTION_HANDLER_NAMES} breakpad_client)
-FIND_LIBRARY(BREAKPAD_EXCEPTION_HANDLER_LIBRARY
-  NAMES ${BREAKPAD_EXCEPTION_HANDLER_NAMES}
-  )
-
-IF (BREAKPAD_EXCEPTION_HANDLER_LIBRARY AND BREAKPAD_INCLUDE_DIRECTORIES)
-    SET(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES ${BREAKPAD_EXCEPTION_HANDLER_LIBRARY})
-    SET(BREAKPAD_EXCEPTION_HANDLER_FOUND "YES")
-ELSE (BREAKPAD_EXCEPTION_HANDLER_LIBRARY AND BREAKPAD_INCLUDE_DIRECTORIES)
-    SET(BREAKPAD_EXCEPTION_HANDLER_FOUND "NO")
-ENDIF (BREAKPAD_EXCEPTION_HANDLER_LIBRARY AND BREAKPAD_INCLUDE_DIRECTORIES)
-
-
-IF (BREAKPAD_EXCEPTION_HANDLER_FOUND)
-   IF (NOT BREAKPAD_EXCEPTION_HANDLER_FIND_QUIETLY)
-      MESSAGE(STATUS "Found Google BreakPad: ${BREAKPAD_EXCEPTION_HANDLER_LIBRARIES}")
-   ENDIF (NOT BREAKPAD_EXCEPTION_HANDLER_FIND_QUIETLY)
-ELSE (BREAKPAD_EXCEPTION_HANDLER_FOUND)
-   IF (BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find Google BreakPad library")
-   ENDIF (BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED)
-ENDIF (BREAKPAD_EXCEPTION_HANDLER_FOUND)
-
-MARK_AS_ADVANCED(
-  BREAKPAD_EXCEPTION_HANDLER_LIBRARY
-  BREAKPAD_INCLUDE_DIRECTORIES
-  )

indra/cmake/FindJsonCpp.cmake

@@ -1,39 +0,0 @@
-# -*- cmake -*-
-
-# - Find JSONCpp
-# Find the JSONCpp includes and library
-# This module defines
-#  JSONCPP_FOUND, System has libjsoncpp.
-#  JSONCPP_INCLUDE_DIRS - The libjsoncpp include directories.
-#  JSONCPP_LIBRARIES - The libraries needed to use libjsoncpp.
-#  JSONCPP_DEFINITIONS - Compiler switches required for using libjsoncpp.
-
-FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(PC_JSONCPP jsoncpp)
-SET(JSONCPP_DEFINITIONS ${PC_JSONCPP_CFLAGS_OTHER})
-
-FIND_PATH(JSONCPP_INCLUDE_DIR json/reader.h
-  HINTS ${PC_JSONCPP_INCLUDE_DIR} ${PC_JSONCPP_INCLUDE_DIRS}
-  PATH_SUFFIXES jsoncpp)
-
-# Get the GCC compiler version
-EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
-            ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-            OUTPUT_VARIABLE _gcc_COMPILER_VERSION
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-
-# Try to find a library that was compiled with the same compiler version as we currently use.
-FIND_LIBRARY(JSONCPP_LIBRARY
-  NAMES libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so libjsoncpp.so
-  HINTS ${PC_JSONCPP_LIBDIR} ${PC_JSONCPP_LIBRARY_DIRS}
-  PATHS /usr/lib /usr/local/lib)
-
-SET(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY})
-SET(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JSONCPP DEFAULT_MSG
-  JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(JSONCPP_LIBRARY JSONCPP_INCLUDE_DIR)

indra/cmake/FindLLQtWebkit.cmake

@@ -1,62 +0,0 @@
-# -*- cmake -*-
-
-# - Find llqtwebkit
-# Find the llqtwebkit includes and library
-# This module defines
-#  LLQTWEBKIT_INCLUDE_DIR, where to find llqtwebkit.h, etc.
-#  LLQTWEBKIT_LIBRARY, the llqtwebkit library with full path.
-#  LLQTWEBKIT_FOUND, If false, do not try to use llqtwebkit.
-# also defined, but not for general use are
-#  LLQTWEBKIT_LIBRARIES, the libraries needed to use llqtwebkit.
-#  LLQTWEBKIT_LIBRARY_DIRS, where to find the llqtwebkit library.
-#  LLQTWEBKIT_DEFINITIONS - You should add_definitions(${LLQTWEBKIT_DEFINITIONS})
-#      before compiling code that includes llqtwebkit library files.
-
-# Try to use pkg-config first.
-# This allows to have two different libllqtwebkit packages installed:
-# one for viewer 2.x and one for viewer 1.x.
-include(FindPkgConfig)
-if (PKG_CONFIG_FOUND)
-    if (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
-        set(_PACKAGE_ARGS libllqtwebkit>=${LLQtWebkit_FIND_VERSION} REQUIRED)
-    else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
-        set(_PACKAGE_ARGS libllqtwebkit)
-    endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
-    if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8")
-      # As virtually nobody will have a pkg-config file for this, do this check always quiet.
-      # Unfortunately cmake 2.8 or higher is required for pkg_check_modules to have a 'QUIET'.
-      set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET)
-    endif ()
-    pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS})
-endif (PKG_CONFIG_FOUND)
-set(LLQTWEBKIT_DEFINITIONS ${LLQTWEBKIT_CFLAGS_OTHER})
-
-find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_INCLUDE_DIRS})
-
-find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS})
-
-if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)   # If pkg-config couldn't find it, pretend we don't have pkg-config.
-   set(LLQTWEBKIT_LIBRARIES llqtwebkit)
-   get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH)
-endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND)
-
-# Handle the QUIETLY and REQUIRED arguments and set LLQTWEBKIT_FOUND
-# to TRUE if all listed variables are TRUE.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
-  LLQTWEBKIT
-  DEFAULT_MSG
-  LLQTWEBKIT_LIBRARY
-  LLQTWEBKIT_INCLUDE_DIR
-  LLQTWEBKIT_LIBRARIES
-  LLQTWEBKIT_LIBRARY_DIRS
-  )
-
-mark_as_advanced(
-  LLQTWEBKIT_LIBRARY
-  LLQTWEBKIT_INCLUDE_DIR
-  LLQTWEBKIT_LIBRARIES
-  LLQTWEBKIT_LIBRARY_DIRS
-  LLQTWEBKIT_DEFINITIONS
-  )
-

indra/cmake/FindURIPARSER.cmake

@@ -0,0 +1,46 @@
+# -*- cmake -*-
+
+# - Find uriparser
+# Find the URIPARSER includes and library
+# This module defines
+#  URIPARSER_INCLUDE_DIRS, where to find uriparser.h, etc.
+#  URIPARSER_LIBRARY, the libraries needed to use uriparser.
+#  URIPARSER_FOUND, If false, do not try to use uriparser.
+#
+# This FindURIPARSER is about 43 times as fast the one provided with cmake (2.8.x),
+# because it doesn't look up the version of uriparser, resulting in a dramatic
+# speed up for configure (from 4 minutes 22 seconds to 6 seconds).
+#
+# Note: Since this file is only used for standalone, the windows
+# specific parts were left out.
+
+FIND_PATH(URIPARSER_INCLUDE_DIR uriparser/Uri.h
+  NO_SYSTEM_ENVIRONMENT_PATH
+  )
+
+FIND_LIBRARY(URIPARSER_LIBRARY uriparser)
+
+if (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+  SET(URIPARSER_INCLUDE_DIRS ${URIPARSER_INCLUDE_DIR})
+  SET(URIPARSER_LIBRARY ${URIPARSER_LIBRARY})
+  SET(URIPARSER_FOUND "YES")
+else (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+  SET(URIPARSER_FOUND "NO")
+endif (URIPARSER_LIBRARY AND URIPARSER_INCLUDE_DIR)
+
+if (URIPARSER_FOUND)
+  if (NOT URIPARSER_FIND_QUIETLY)
+    message(STATUS "Found URIPARSER: ${URIPARSER_LIBRARY}")
+    SET(URIPARSER_FIND_QUIETLY TRUE)
+  endif (NOT URIPARSER_FIND_QUIETLY)
+else (URIPARSER_FOUND)
+  if (URIPARSER_FIND_REQUIRED)
+    message(FATAL_ERROR "Could not find URIPARSER library")
+  endif (URIPARSER_FIND_REQUIRED)
+endif (URIPARSER_FOUND)
+
+mark_as_advanced(
+  URIPARSER_LIBRARY
+  URIPARSER_INCLUDE_DIR
+  )
+

indra/cmake/FreeType.cmake

@@ -1,20 +1,14 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-if (STANDALONE)
+if (LINUX)
   include(FindPkgConfig)
 
   pkg_check_modules(FREETYPE REQUIRED freetype2)
-else (STANDALONE)
+else (LINUX)
   use_prebuilt_binary(freetype)
-  if (LINUX)
-    set(FREETYPE_INCLUDE_DIRS
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-  else (LINUX)
-    set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-  endif (LINUX)
-
+  set(FREETYPE_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/freetype2)
   set(FREETYPE_LIBRARIES freetype)
-endif (STANDALONE)
+endif (LINUX)
 
 link_directories(${FREETYPE_LIBRARY_DIRS})

indra/cmake/GLOD.cmake

@@ -7,7 +7,8 @@ set(GLOD_FIND_REQUIRED ON)
 if (STANDALONE)
   include(FindGLOD)
 else (STANDALONE)
-  use_prebuilt_binary(GLOD)
-  set(GLOD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-  set(GLOD_LIBRARIES glod)
+  use_prebuilt_binary(glod)
+
+  set(GLOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/glod)
+  set(GLOD_LIBRARIES GLOD)
 endif (STANDALONE)

indra/cmake/GStreamer010Plugin.cmake

@@ -1,27 +1,9 @@
 # -*- cmake -*-
 include(Prebuilt)
-
-if (STANDALONE)
   include(FindPkgConfig)
-
   pkg_check_modules(GSTREAMER010 REQUIRED gstreamer-0.10)
   pkg_check_modules(GSTREAMER010_PLUGINS_BASE REQUIRED gstreamer-plugins-base-0.10)
 
-else (STANDALONE)
-
-  # Possibly libxml and glib should have their own .cmake file instead...
-  use_prebuilt_binary(glib)			# gstreamer needs glib
-  use_prebuilt_binary(libxml)
-  use_prebuilt_binary(gstreamer)
-  set(GSTREAMER010_FOUND ON FORCE BOOL)
-  set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
-  set(GSTREAMER010_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
-      )
-
-endif (STANDALONE)
 
 if (WINDOWS)
   # We don't need to explicitly link against gstreamer itself, because

indra/cmake/GeneratePrecompiledHeader.cmake

@@ -0,0 +1,116 @@
+# -*- cmake -*-
+
+# Distributed under the MIT Software License
+# Copyright (c) 2015-2017 Borislav Stanimirov
+# Modifications Copyright (c) 2019 Cinder Roxley. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of 
+# this software and associated documentation files (the "Software"), to deal in 
+# the Software without restriction, including without limitation the rights to 
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+# of the Software, and to permit persons to whom the Software is furnished to do 
+# so, subject to the following conditions:
+# The above copyright notice and this permission notice shall be included in all 
+# copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+# SOFTWARE.
+
+# target_precompiled_header
+#
+# Sets a precompiled header for a given target
+# Args:
+#   TARGET_NAME - Name of the target. Only valid after add_library or add_executable
+#   PRECOMPILED_HEADER - Header file to precompile
+#   PRECOMPILED_SOURCE - MSVC specific source to do the actual precompilation. Ignored on other platforms
+#
+
+macro(target_precompiled_header TARGET_NAME PRECOMPILED_HEADER PRECOMPILED_SOURCE)
+    get_filename_component(PRECOMPILED_HEADER_NAME ${PRECOMPILED_HEADER} NAME)
+
+    if(MSVC)
+        get_filename_component(PRECOMPILED_SOURCE_NAME ${PRECOMPILED_SOURCE} NAME)
+        get_filename_component(PRECOMPILED_HEADER_PATH ${PRECOMPILED_HEADER} DIRECTORY)
+        target_include_directories(${TARGET_NAME} PRIVATE ${PRECOMPILED_HEADER_PATH}) # fixes occasional IntelliSense glitches
+
+        get_filename_component(PRECOMPILED_HEADER_WE ${PRECOMPILED_HEADER} NAME_WE)
+        if(GEN_IS_MULTI_CONFIG)
+            set(PRECOMPILED_BINARY "$(IntDir)/${PRECOMPILED_HEADER_WE}.pch")
+        else()
+            set(PRECOMPILED_BINARY "${CMAKE_CURRENT_BINARY_DIR}/${PRECOMPILED_HEADER_WE}.pch")
+        endif()
+        
+        set_source_files_properties(${PRECOMPILED_SOURCE} PROPERTIES 
+             COMPILE_OPTIONS "/Yc${PRECOMPILED_HEADER_NAME};/Fp${PRECOMPILED_BINARY}"
+             OBJECT_OUTPUTS "${PRECOMPILED_BINARY}")
+
+        get_target_property(TARGET_SOURCES ${TARGET_NAME} SOURCES)
+        foreach(src ${TARGET_SOURCES})
+            if(${src} MATCHES \\.\(cpp|cxx|cc\)$)
+                set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/${src}" PROPERTIES
+                    COMPILE_OPTIONS "/Yu${PRECOMPILED_HEADER_NAME};/FI${PRECOMPILED_HEADER_NAME};/Fp${PRECOMPILED_BINARY}"
+                    OBJECT_DEPENDS "${PRECOMPILED_BINARY}"
+                    )
+            endif()
+        endforeach()
+        #set_target_properties(${TARGET_NAME} PROPERTIES 
+        #     COMPILE_OPTIONS "/Yu${PRECOMPILED_HEADER_NAME};/FI${PRECOMPILED_HEADER_NAME};/Fp${PRECOMPILED_BINARY}")
+
+        target_sources(${TARGET_NAME} PRIVATE ${PRECOMPILED_SOURCE} ${PRECOMPILED_HEADER})
+    elseif(CMAKE_GENERATOR STREQUAL Xcode)
+        set_target_properties(
+            ${TARGET_NAME}
+            PROPERTIES
+            XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${PRECOMPILED_HEADER}"
+            XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES"
+            )
+    elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        # Create and set output directory.
+        set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${PRECOMPILED_HEADER_NAME}.gch")
+        make_directory(${OUTPUT_DIR})
+        set(OUTPUT_NAME "${OUTPUT_DIR}/${PRECOMPILED_HEADER_NAME}.gch")
+
+    # Export compiler flags via a generator to a response file
+        set(PCH_FLAGS_FILE "${OUTPUT_DIR}/${PRECOMPILED_HEADER_NAME}.rsp")
+        set(_include_directories "$<TARGET_PROPERTY:${TARGET_NAME},INCLUDE_DIRECTORIES>")
+        set(_compile_definitions "$<TARGET_PROPERTY:${TARGET_NAME},COMPILE_DEFINITIONS>")
+        set(_compile_flags "$<TARGET_PROPERTY:${TARGET_NAME},COMPILE_FLAGS>")
+        set(_compile_options "$<TARGET_PROPERTY:${TARGET_NAME},COMPILE_OPTIONS>")
+        set(_include_directories "$<$<BOOL:${_include_directories}>:-I$<JOIN:${_include_directories},\n-I>\n>")
+        set(_compile_definitions "$<$<BOOL:${_compile_definitions}>:-D$<JOIN:${_compile_definitions},\n-D>\n>")
+        set(_compile_flags "$<$<BOOL:${_compile_flags}>:$<JOIN:${_compile_flags},\n>\n>")
+        set(_compile_options "$<$<BOOL:${_compile_options}>:$<JOIN:${_compile_options},\n>\n>")
+        file(GENERATE OUTPUT "${PCH_FLAGS_FILE}" CONTENT "${_compile_definitions}${_include_directories}${_compile_flags}${_compile_options}\n")
+
+        # Gather global compiler options, definitions, etc.
+        string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" CXX_FLAGS)
+        set(COMPILER_FLAGS "${${CXX_FLAGS}} ${CMAKE_CXX_FLAGS}")
+        separate_arguments(COMPILER_FLAGS)
+
+        # Add a custom target for building the precompiled header.
+        add_custom_command(
+            OUTPUT ${OUTPUT_NAME}
+            COMMAND ${CMAKE_CXX_COMPILER} @${PCH_FLAGS_FILE} ${COMPILER_FLAGS} -x c++-header -o ${OUTPUT_NAME} ${PRECOMPILED_HEADER}
+            DEPENDS ${PRECOMPILED_HEADER})
+        add_custom_target(${TARGET_NAME}_gch DEPENDS ${OUTPUT_NAME})
+        add_dependencies(${TARGET_NAME} ${TARGET_NAME}_gch)
+
+        # set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_FLAGS "-include ${PRECOMPILED_HEADER_NAME} -Winvalid-pch")
+        get_target_property(SOURCE_FILES ${TARGET_NAME} SOURCES)
+        get_target_property(asdf ${TARGET_NAME} COMPILE_FLAGS)
+        foreach(SOURCE_FILE ${SOURCE_FILES})
+            if(SOURCE_FILE MATCHES \\.\(c|cc|cxx|cpp\)$)
+                set_source_files_properties(${SOURCE_FILE} PROPERTIES
+                   COMPILE_FLAGS "-include ${OUTPUT_DIR}/${PRECOMPILED_HEADER_NAME} -Winvalid-pch"
+                )
+            endif()
+        endforeach()
+    else()
+        message(FATAL_ERROR "Unknown generator for target_precompiled_header. [${CMAKE_CXX_COMPILER_ID}]")
+    endif()
+endmacro(target_precompiled_header)
+

indra/cmake/GoogleBreakpad.cmake

@@ -1,21 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (STANDALONE)
-  set(BREAKPAD_EXCEPTION_HANDLER_FIND_REQUIRED ON)
-  include(FindGoogleBreakpad)
-else (STANDALONE)
-  use_prebuilt_binary(google_breakpad)
-  if (DARWIN)
-    set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler)
-  endif (DARWIN)
-  if (LINUX)
-    set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES breakpad_client)
-  endif (LINUX)
-  if (WINDOWS)
-    set(BREAKPAD_EXCEPTION_HANDLER_LIBRARIES exception_handler crash_generation_client crash_generation_server common)
-  endif (WINDOWS)
-  # yes, this does look dumb, no, it's not incorrect
-  # I think it's incorrect: the second one should go --Aleric
-  set(BREAKPAD_INCLUDE_DIRECTORIES "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/google_breakpad" "${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/google_breakpad/google_breakpad")
-endif (STANDALONE)

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\"")
@@ -25,7 +25,9 @@ else (STANDALONE)
       set(TCMALLOC_LIBRARIES tcmalloc_minimal)
     endif()
     set(GOOGLE_PERFTOOLS_INCLUDE_DIR
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+      ${LIBS_PREBUILT_DIR}/include
+      ${LIBS_PREBUILT_LEGACY_DIR}/include
+      )
   endif (LINUX)
 endif (STANDALONE)
 

indra/cmake/Hunspell.cmake

@@ -4,13 +4,13 @@ include(Prebuilt)
 if (STANDALONE)
 	include(FindHunSpell)
 else (STANDALONE)
-    use_prebuilt_binary(hunspell)
-	
-	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/hunspell)
+  use_prebuilt_binary(libhunspell)
 
-	if (LINUX OR DARWIN)
-	    set(HUNSPELL_LIBRARY hunspell-1.3)
-	else (LINUX OR DARWIN)
-	    set(HUNSPELL_LIBRARY libhunspell)
-	endif (LINUX OR DARWIN)
+  if (LINUX OR DARWIN)
+    set(HUNSPELL_LIBRARY hunspell-1.3)
+  else (LINUX OR DARWIN)
+    set(HUNSPELL_LIBRARY libhunspell)
+  endif (LINUX OR DARWIN)
+  set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
+  use_prebuilt_binary(dictionaries)
 endif (STANDALONE)

indra/cmake/JPEG.cmake

@@ -13,11 +13,11 @@ else (STANDALONE)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
     set(JPEG_LIBRARIES
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libjpeg.a
+      debug libjpeg.a
+      optimized libjpeg.a
       )
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)
   endif (LINUX)
-  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(JPEG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cmake/Json.cmake

@@ -0,0 +1,6 @@
+# -*- cmake -*-
+
+include(Prebuilt)
+
+use_prebuilt_binary(modernjson)
+set(JSON_INCLUDE_DIR "${LIBS_PREBUILT_DIR}/include")

indra/cmake/JsonCpp.cmake

@@ -1,22 +0,0 @@
-# -*- cmake -*-
-
-include(Prebuilt)
-
-set(JSONCPP_FIND_QUIETLY OFF)
-set(JSONCPP_FIND_REQUIRED ON)
-
-if (STANDALONE)
-  include(FindJsonCpp)
-else (STANDALONE)
-  use_prebuilt_binary(jsoncpp)
-  if (WINDOWS)
-    set(JSONCPP_LIBRARIES 
-      debug json_vc${MSVC_SUFFIX}d
-      optimized json_vc${MSVC_SUFFIX})
-  elseif (DARWIN)
-    set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
-  elseif (LINUX)
-    set(JSONCPP_LIBRARIES jsoncpp)
-  endif (WINDOWS)
-  set(JSONCPP_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/jsoncpp)
-endif (STANDALONE)

indra/cmake/LLAddBuildTest.cmake

@@ -87,7 +87,7 @@ MACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files)
         ${libraries}
         )
 
-    GET_TARGET_PROPERTY(TEST_EXE ${name}_test LOCATION)
+	SET(TEST_EXE $<TARGET_FILE:${name}_test>)
     SET(TEST_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}_test_ok.txt)
 
     IF ("${wrapper}" STREQUAL "")
@@ -105,17 +105,6 @@ MACRO(ADD_BUILD_TEST_INTERNAL name parent libraries source_files)
     IF (NOT "$ENV{LD_LIBRARY_PATH}" STREQUAL "")
       SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LD_LIBRARY_PATH}")
     ENDIF (NOT "$ENV{LD_LIBRARY_PATH}" STREQUAL "")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT ${TEST_OUTPUT}
-        COMMAND
-          ${CMAKE_COMMAND}
-            "-DLD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
-            "-DTEST_CMD:STRING=${TEST_CMD}"
-            -P ${CMAKE_SOURCE_DIR}/cmake/RunBuildTest.cmake
-        DEPENDS ${name}_test
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        VERBATIM
-        )
 
     ADD_CUSTOM_TARGET(${name}_test_ok ALL DEPENDS ${TEST_OUTPUT})
     IF (${parent})

indra/cmake/LLAudio.cmake

@@ -1,11 +1,12 @@
 # -*- cmake -*-
 
 include(Audio)
+include(OPENAL)
 
 set(LLAUDIO_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llaudio
     )
 
-add_definitions(-DOV_EXCLUDE_STATIC_CALLBACKS)
+#add_definitions(-DOV_EXCLUDE_STATIC_CALLBACKS)
 	
 set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES})

indra/cmake/LLCommon.cmake

@@ -3,6 +3,7 @@
 include(APR)
 include(Boost)
 include(EXPAT)
+include(Linking)
 include(ZLIB)
 
 if (DARWIN)
@@ -10,7 +11,6 @@ if (DARWIN)
   find_library(CORESERVICES_LIBRARY CoreServices)
 endif (DARWIN)
 
-
 set(LLCOMMON_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/cwdebug
     ${LIBS_OPEN_DIR}/llcommon
@@ -19,16 +19,11 @@ 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
+    fmt::fmt
+    )
 
-set(LLCOMMON_LINK_SHARED ON CACHE BOOL "Build the llcommon target as a shared library.")
+set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a shared library.")
 if(LLCOMMON_LINK_SHARED)
   add_definitions(-DLL_COMMON_LINK_SHARED=1)
 endif(LLCOMMON_LINK_SHARED)

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)

indra/cmake/LLPrimitive.cmake

@@ -1,22 +1,32 @@
 # -*- cmake -*-
 
+# these should be moved to their own cmake file
+include(Prebuilt)
+include(Boost)
 include(Colladadom)
 
+
+use_prebuilt_binary(libxml2)
+
 set(LLPRIMITIVE_INCLUDE_DIRS
   ${LIBS_OPEN_DIR}/llprimitive
   ${COLLADADOM_INCLUDE_DIRS}
   )
 
 if (WINDOWS)
-  set(LLPRIMITIVE_LIBRARIES 
-	  debug llprimitive
-	  optimized llprimitive
-	  ${COLLADADOM_LIBRARIES}
-	  )
+    set(LLPRIMITIVE_LIBRARIES
+        llprimitive
+        ${COLLADADOM_LIBRARIES}
+        libxml2_a
+        ${BOOST_SYSTEM_LIBRARIES}
+        )
 else (WINDOWS)
-  set(LLPRIMITIVE_LIBRARIES 
-	  llprimitive
-	  ${COLLADADOM_LIBRARIES}
-	  )
+    set(LLPRIMITIVE_LIBRARIES 
+        llprimitive
+        ${COLLADADOM_LIBRARIES}
+        ${BOOST_SYSTEM_LIBRARIES}
+        minizip
+        xml2
+        )
 endif (WINDOWS)
 

indra/cmake/LLQtWebkit.cmake

@@ -1,11 +0,0 @@
-# -*- cmake -*-
-
-if (STANDALONE)
-  set(LLQTWEBKIT_INCLUDE_DIR
-      ${LIBS_OPEN_DIR}/llqtwebkit
-      )
-
-  set(LLQTWEBKIT_LIBRARY
-      llqtwebkit
-      )
-endif (STANDALONE)

indra/cmake/LLSharedLibs.cmake

@@ -1,37 +1,40 @@
 # ll_deploy_sharedlibs_command
 # target_exe: the cmake target of the executable for which the shared libs will be deployed.
 macro(ll_deploy_sharedlibs_command target_exe) 
-  get_target_property(TARGET_LOCATION ${target_exe} LOCATION)
+  set(TARGET_LOCATION $<TARGET_FILE:${target_exe}>)
   get_filename_component(OUTPUT_PATH ${TARGET_LOCATION} PATH)
-  
-  if(DARWIN)
-    SET_TEST_PATH(SEARCH_DIRS)
-    get_target_property(IS_BUNDLE ${target_exe} MACOSX_BUNDLE)
-    if(IS_BUNDLE)
-      # If its a bundle the exe is not in the target location, this should find it.
-      get_filename_component(TARGET_FILE ${TARGET_LOCATION} NAME)
-      set(OUTPUT_PATH ${TARGET_LOCATION}.app/Contents/MacOS)
-      set(TARGET_LOCATION ${OUTPUT_PATH}/${TARGET_FILE})
-      set(OUTPUT_PATH ${OUTPUT_PATH}/../Resources)
-    endif(IS_BUNDLE)
-  elseif(WINDOWS)
-    SET_TEST_PATH(SEARCH_DIRS)
-    LIST(APPEND SEARCH_DIRS "$ENV{SystemRoot}/system32")
-  elseif(LINUX)
-    SET_TEST_PATH(SEARCH_DIRS)
-    set(OUTPUT_PATH ${OUTPUT_PATH}/lib)
-  endif(DARWIN)
 
-  add_custom_command(
-    TARGET ${target_exe} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} 
-    ARGS
-    "-DBIN_NAME=\"${TARGET_LOCATION}\""
-    "-DSEARCH_DIRS=\"${SEARCH_DIRS}\""
-    "-DDST_PATH=\"${OUTPUT_PATH}\""
-    "-P"
-    "${CMAKE_SOURCE_DIR}/cmake/DeploySharedLibs.cmake"
-    )
+  # It's not clear that this does anything useful for us on Darwin. It has
+  # been broken for some time now; the BIN_NAME was being constructed as a
+  # ridiculous nonexistent path with duplicated segments. Fixing that only
+  # produces ominous spammy warnings: at the time the command below is run, we
+  # have not yet populated the nested mac-crash-logger.app/Contents/Resources
+  # with the .dylibs with which it was linked. Moreover, the form of the
+  # embedded @executable_path/../Resources/mumble.dylib pathname confuses the
+  # GetPrerequisites.cmake tool invoked by DeploySharedLibs.cmake. It seems
+  # clear that we have long since accomplished by other means what this was
+  # originally supposed to do. Skipping it only eliminates an annoying
+  # non-fatal error.
+  if(NOT DARWIN)
+    if(WINDOWS)
+      SET_TEST_PATH(SEARCH_DIRS)
+      LIST(APPEND SEARCH_DIRS "$ENV{SystemRoot}/system32")
+    elseif(LINUX)
+      SET_TEST_PATH(SEARCH_DIRS)
+      set(OUTPUT_PATH ${OUTPUT_PATH}/lib)
+    endif(WINDOWS)
+
+    add_custom_command(
+      TARGET ${target_exe} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} 
+      ARGS
+      "-DBIN_NAME=\"${TARGET_LOCATION}\""
+      "-DSEARCH_DIRS=\"${SEARCH_DIRS}\""
+      "-DDST_PATH=\"${OUTPUT_PATH}\""
+      "-P"
+      "${CMAKE_SOURCE_DIR}/cmake/DeploySharedLibs.cmake"
+      )
+  endif(NOT DARWIN)
 
 endmacro(ll_deploy_sharedlibs_command)
 

indra/cmake/LLWindow.cmake

@@ -1,9 +1,8 @@
 # -*- cmake -*-
 
 include(OpenGL)
-include(Prebuilt)
 
-if (STANDALONE)
+if (LINUX)
   include(FindSDL)
 
   # This should be done by FindSDL.  Sigh.
@@ -12,19 +11,7 @@ if (STANDALONE)
       SDL_INCLUDE_DIR
       SDL_LIBRARY
       )
-else (STANDALONE)
-  if (LINUX)
-    use_prebuilt_binary(mesa)
-    use_prebuilt_binary(SDL)
-    set (SDL_FOUND TRUE)
-    set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
-    if(WORD_SIZE EQUAL 64)
-      set (SDL_LIBRARY SDL)
-    else(WORD_SIZE EQUAL 64)
-      set (SDL_LIBRARY SDL directfb fusion direct)
-    endif(WORD_SIZE EQUAL 64)
-  endif (LINUX)
-endif (STANDALONE)
+endif (LINUX)
 
 if (SDL_FOUND)
   add_definitions(-DLL_SDL=1)

indra/cmake/LibVLCPlugin.cmake

@@ -0,0 +1,30 @@
+# -*- cmake -*-
+include(Linking)
+include(Prebuilt)
+include(Variables)
+
+if (LIBVLCPLUGIN)
+if (USESYSTEMLIBS)
+else (USESYSTEMLIBS)
+    use_prebuilt_binary(vlc-bin)
+    set(VLC_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/vlc)
+endif (USESYSTEMLIBS)
+
+if (WINDOWS)
+    set(VLC_PLUGIN_LIBRARIES
+        libvlc.lib
+        libvlccore.lib
+    )
+elseif (DARWIN)
+    set(VLC_PLUGIN_LIBRARIES
+        libvlc.dylib
+        libvlccore.dylib
+    )
+elseif (LINUX)
+    # Specify a full path to make sure we get a static link
+    set(VLC_PLUGIN_LIBRARIES
+        ${LIBS_PREBUILT_DIR}/lib/libvlc.a
+        ${LIBS_PREBUILT_DIR}/lib/libvlccore.a
+    )
+endif (WINDOWS)
+endif (LIBVLCPLUGIN)

indra/cmake/Linking.cmake

@@ -1,39 +1,58 @@
 # -*- cmake -*-
+
 if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
 set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
 
 include(Variables)
 
-if (NOT STANDALONE)
-  set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
-  set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
-  set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
+set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib)
+set(ARCH_PREBUILT_DIRS_PLUGINS ${AUTOBUILD_INSTALL_DIR}/plugins)
+set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release)
+set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug)
+if (WINDOWS)
+  set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
+  set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
+elseif (LINUX)
+  set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/lib)
+  set(EXE_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs/bin)
+elseif (DARWIN)
+  set(SHARED_LIB_STAGING_DIR ${CMAKE_BINARY_DIR}/sharedlibs)
+  set(EXE_STAGING_DIR "${CMAKE_BINARY_DIR}/sharedlibs")
+endif (WINDOWS)
 
-  if(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
-    # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
-    # fortunately both windows and darwin are case insensitive filesystems so this works.
-    set(ARCH_PREBUILT_LINK_DIRS "${ARCH_PREBUILT_DIRS}")
-  else(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
-    # else block is for linux and any other makefile based generators
-    string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-    set(ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS}/${CMAKE_BUILD_TYPE_LOWER})
-  endif(WINDOWS OR ${CMAKE_GENERATOR} MATCHES "Xcode")
+# Autobuild packages must provide 'release' versions of libraries, but may provide versions for
+# specific build types.  AUTOBUILD_LIBS_INSTALL_DIRS lists first the build type directory and then
+# the 'release' directory (as a default fallback).
+# *NOTE - we have to take special care to use CMAKE_CFG_INTDIR on IDE generators (like mac and
+# windows) and CMAKE_BUILD_TYPE on Makefile based generators (like linux).  The reason for this is
+# that CMAKE_BUILD_TYPE is essentially meaningless at configuration time for IDE generators and
+# CMAKE_CFG_INTDIR is meaningless at build time for Makefile generators
+if(GEN_IS_MULTI_CONFIG)
+  # the cmake xcode and VS generators implicitly append ${CMAKE_CFG_INTDIR} to the library paths for us
+  # fortunately both windows and darwin are case insensitive filesystems so this works.
+  set(AUTOBUILD_LIBS_INSTALL_DIRS "${AUTOBUILD_INSTALL_DIR}/lib/")
+else()
+  # else block is for linux and any other makefile based generators
+  string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
+  set(AUTOBUILD_LIBS_INSTALL_DIRS ${AUTOBUILD_INSTALL_DIR}/lib/${CMAKE_BUILD_TYPE_LOWER})
+endif()
 
-  if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-    # When we're building something other than Release, append the
-    # packages/lib/release directory to deal with autobuild packages that don't
-    # provide (e.g.) lib/debug libraries.
-    list(APPEND ARCH_PREBUILT_LINK_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
-  endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-endif (NOT STANDALONE)
+if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+  # When we're building something other than Release, append the
+  # packages/lib/release directory to deal with autobuild packages that don't
+  # provide (e.g.) lib/debug libraries.
+  list(APPEND AUTOBUILD_LIBS_INSTALL_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
+endif (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release")
 
-link_directories(${ARCH_PREBUILT_LINK_DIRS})
+link_directories(${AUTOBUILD_LIBS_INSTALL_DIRS})
 
 if (LINUX)
   set(DL_LIBRARY dl)
+  set(RT_LIBRARY rt)
   set(PTHREAD_LIBRARY pthread)
 else (LINUX)
   set(DL_LIBRARY "")
+  set(RT_LIBRARY "")
   set(PTHREAD_LIBRARY "")
 endif (LINUX)
 
@@ -41,6 +60,7 @@ if (WINDOWS)
   set(WINDOWS_LIBRARIES
       advapi32
       shell32
+      ole32
       ws2_32
       mswsock
       psapi
@@ -55,6 +75,6 @@ else (WINDOWS)
   set(WINDOWS_LIBRARIES "")
 endif (WINDOWS)
     
-mark_as_advanced(DL_LIBRARY PTHREAD_LIBRARY WINDOWS_LIBRARIES)
+mark_as_advanced(DL_LIBRARY RT_LIBRARY PTHREAD_LIBRARY WINDOWS_LIBRARIES)
 
 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

indra/cmake/NDOF.cmake

@@ -7,7 +7,11 @@ if (STANDALONE)
     message(STATUS "Building without N-DoF joystick support")
   endif(NOT NDOF_FOUND)
 else (STANDALONE)
-  use_prebuilt_binary(ndofdev)
+  if (WINDOWS OR DARWIN)
+    use_prebuilt_binary(libndofdev)
+  elseif (LINUX)
+    use_prebuilt_binary(libndofdev-open)
+  endif (WINDOWS OR DARWIN)
 
   if (WINDOWS)
     set(NDOF_LIBRARY libndofdev)
@@ -15,7 +19,11 @@ else (STANDALONE)
     set(NDOF_LIBRARY ndofdev)
   endif (WINDOWS)
 
-  set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/ndofdev)
+	if (WINDOWS)
+      set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+	else (WINDOWS)
+      set(NDOF_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/ndofdev)
+	endif (WINDOWS)
   set(NDOF_FOUND 1)
 endif (STANDALONE)
 
@@ -23,6 +31,8 @@ if (NDOF_FOUND)
   add_definitions(-DLIB_NDOF=1)
   include_directories(${NDOF_INCLUDE_DIR})
 else (NDOF_FOUND)
+  message(STATUS "Building without N-DoF joystick support")
   set(NDOF_INCLUDE_DIR "")
   set(NDOF_LIBRARY "")
 endif (NDOF_FOUND)
+

indra/cmake/NVAPI.cmake

@@ -0,0 +1,19 @@
+# -*- cmake -*-
+include(Prebuilt)
+include(Variables)
+
+if (USE_NVAPI)
+  if (WINDOWS)
+    use_prebuilt_binary(nvapi)
+    if (ADDRESS_SIZE EQUAL 32)
+      set(NVAPI_LIBRARY nvapi)
+    elseif (ADDRESS_SIZE EQUAL 64)
+      set(NVAPI_LIBRARY nvapi64)
+    endif (ADDRESS_SIZE EQUAL 32)	
+  else (WINDOWS)
+    set(NVAPI_LIBRARY "")
+  endif (WINDOWS)
+else (USE_NVAPI)
+  set(NVAPI_LIBRARY "")
+endif (USE_NVAPI)
+

indra/cmake/OPENAL.cmake

@@ -9,21 +9,25 @@ else (LINUX)
 endif (LINUX)
 
 if (OPENAL)
+  set(OPENAL_LIB_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/AL")
   if (STANDALONE)
     include(FindPkgConfig)
     include(FindOpenAL)
     pkg_check_modules(OPENAL_LIB REQUIRED openal)
     pkg_check_modules(FREEALUT_LIB REQUIRED freealut)
   else (STANDALONE)
-    use_prebuilt_binary(openal-soft)
+    use_prebuilt_binary(openal)
   endif (STANDALONE)
+  if(WINDOWS)
   set(OPENAL_LIBRARIES 
-    openal
+    OpenAL32
     alut
     )
-    set(OPENAL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
-endif (OPENAL)
-
-if (OPENAL)
+  else()
+  set(OPENAL_LIBRARIES 
+  openal
+  alut
+    )
+  endif()
   message(STATUS "Building with OpenAL audio support")
 endif (OPENAL)

indra/cmake/OpenGL.cmake

@@ -1,7 +1,14 @@
 # -*- cmake -*-
+
+include(Variables)
 include(Prebuilt)
 
 if (NOT (STANDALONE OR DARWIN))
   use_prebuilt_binary(glext)
-  set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(GLEXT_INCLUDE_DIR
+    ${LIBS_PREBUILT_DIR}/include
+    ${LIBS_PREBUILT_LEGACY_DIR}/include
+    )
 endif (NOT (STANDALONE OR DARWIN))
+
+include(FindOpenGL)

indra/cmake/OpenSSL.cmake

@@ -7,15 +7,17 @@ set(OpenSSL_FIND_REQUIRED ON)
 if (STANDALONE OR USE_SYSTEM_OPENSSL)
   include(FindOpenSSL)
 else (STANDALONE OR USE_SYSTEM_OPENSSL)
-  use_prebuilt_binary(openSSL)
+  use_prebuilt_binary(openssl)
   if (WINDOWS)
-    set(OPENSSL_LIBRARIES ssleay32 libeay32)
+    set(OPENSSL_LIBRARIES libssl libcrypto)
   else (WINDOWS)
     set(OPENSSL_LIBRARIES ssl)
   endif (WINDOWS)
-  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+  set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE OR USE_SYSTEM_OPENSSL)
 
-if (LINUX OR DARWIN)
+if (LINUX)
+  set(CRYPTO_LIBRARIES crypto dl)
+elseif (DARWIN)
   set(CRYPTO_LIBRARIES crypto)
-endif (LINUX OR DARWIN)
+endif (LINUX)

indra/cmake/PNG.cmake

@@ -9,11 +9,28 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(libpng)
   if (WINDOWS)
-    set(PNG_LIBRARIES libpng15)
+    set(PNG_LIBRARIES libpng16)
   elseif(DARWIN)
     set(PNG_LIBRARIES png15)
   else(LINUX)
-    set(PNG_LIBRARIES png15)
+    if (CMAKE_SIZEOF_VOID_P EQUAL 4) # Singu TODO: update png
+      set(PNG_LIBRARIES png15)
+    else ()
+      #
+      # When we have updated static libraries in competition with older
+      # shared libraries and we want the former to win, we need to do some
+      # extra work.  The *_PRELOAD_ARCHIVES settings are invoked early
+      # and will pull in the entire archive to the binary giving it
+      # priority in symbol resolution.  Beware of cmake moving the
+      # achive load itself to another place on the link command line.  If
+      # that happens, you can try something like -Wl,-lpng16 here to hide
+      # the archive.  Also be aware that the linker will not tolerate a
+      # second whole-archive load of the archive.  See viewer's
+      # CMakeLists.txt for more information.
+      #
+      set(PNG_PRELOAD_ARCHIVES -Wl,--whole-archive png16 -Wl,--no-whole-archive)
+      set(PNG_LIBRARIES png16)
+    endif ()
   endif()
-  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/)
+    set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/libpng16)
 endif (STANDALONE)

indra/cmake/Prebuilt.cmake

@@ -3,14 +3,62 @@
 if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
 set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
 
+include(FindAutobuild)
+if(INSTALL_PROPRIETARY)
+  include(FindSCP)
+endif(INSTALL_PROPRIETARY)
+
+set(PREBUILD_TRACKING_DIR ${AUTOBUILD_INSTALL_DIR}/cmake_tracking)
+# For the library installation process;
+# see cmake/Prebuild.cmake for the counterpart code.
+if ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING_DIR}/sentinel_installed")
+  file(MAKE_DIRECTORY ${PREBUILD_TRACKING_DIR})
+  file(WRITE ${PREBUILD_TRACKING_DIR}/sentinel_installed "0")
+endif ("${CMAKE_SOURCE_DIR}/../autobuild.xml" IS_NEWER_THAN "${PREBUILD_TRACKING_DIR}/sentinel_installed")
+
+# The use_prebuilt_binary macro handles automated installation of package
+# dependencies using autobuild.  The goal is that 'autobuild install' should
+# only be run when we know we need to install a new package.  This should be
+# the case in a clean checkout, or if autobuild.xml has been updated since the
+# last run (encapsulated by the file ${PREBUILD_TRACKING_DIR}/sentinel_installed),
+# or if a previous attempt to install the package has failed (the exit status
+# of previous attempts is serialized in the file
+# ${PREBUILD_TRACKING_DIR}/${_binary}_installed)
 macro (use_prebuilt_binary _binary)
-  if(NOT STANDALONE)
-    get_property(PREBUILT_PACKAGES TARGET prepare PROPERTY PREBUILT)
-    list(FIND PREBUILT_PACKAGES ${_binary} _index)
-    if(_index LESS 0)
-      set_property(TARGET prepare APPEND PROPERTY PREBUILT ${_binary})
-    endif(_index LESS 0)
-  endif(NOT STANDALONE)
+  if (NOT DEFINED USESYSTEMLIBS_${_binary})
+    set(USESYSTEMLIBS_${_binary} ${USESYSTEMLIBS})
+  endif (NOT DEFINED USESYSTEMLIBS_${_binary})
+
+  if (NOT USESYSTEMLIBS_${_binary})
+    if("${${_binary}_installed}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/${_binary}_installed")
+      file(READ ${PREBUILD_TRACKING_DIR}/${_binary}_installed "${_binary}_installed")
+      if(DEBUG_PREBUILT)
+        message(STATUS "${_binary}_installed: \"${${_binary}_installed}\"")
+      endif(DEBUG_PREBUILT)
+    endif("${${_binary}_installed}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/${_binary}_installed")
+
+    if(${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
+      if(DEBUG_PREBUILT)
+        message(STATUS "cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
+        --install-dir=${AUTOBUILD_INSTALL_DIR}
+        ${_binary} ")
+      endif(DEBUG_PREBUILT)
+      execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
+        install
+        --install-dir=${AUTOBUILD_INSTALL_DIR}
+        ${_binary}
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+        RESULT_VARIABLE ${_binary}_installed
+        )
+      file(WRITE ${PREBUILD_TRACKING_DIR}/${_binary}_installed "${${_binary}_installed}")
+    endif(${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
+
+    if(NOT ${_binary}_installed EQUAL 0)
+      message(FATAL_ERROR
+              "Failed to download or unpack prebuilt '${_binary}'."
+              " Process returned ${${_binary}_installed}.")
+    endif (NOT ${_binary}_installed EQUAL 0)
+  endif (NOT USESYSTEMLIBS_${_binary})
 endmacro (use_prebuilt_binary _binary)
 
 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)

indra/cmake/PulseAudio.cmake

@@ -1,7 +1,7 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-set(PULSEAUDIO ON CACHE BOOL "Build with PulseAudio support, if available.")
+set(PULSEAUDIO OFF CACHE BOOL "Build with PulseAudio support, if available.")
 
 if (PULSEAUDIO)
   if (STANDALONE)
@@ -13,7 +13,7 @@ if (PULSEAUDIO)
     use_prebuilt_binary(pulseaudio)
     set(PULSEAUDIO_FOUND ON FORCE BOOL)
     set(PULSEAUDIO_INCLUDE_DIRS
-        ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+        ${LIBS_PREBUILT_DIR}/include
         )
     # We don't need to explicitly link against pulseaudio itself, because
     # the viewer probes for the system's copy at runtime.

indra/cmake/Python.cmake

@@ -5,25 +5,33 @@ set(PYTHONINTERP_FOUND)
 if (WINDOWS)
   # On Windows, explicitly avoid Cygwin Python.
 
-  find_program(PYTHON_EXECUTABLE
-    NAMES python25.exe python23.exe python.exe
-    NO_DEFAULT_PATH # added so that cmake does not find cygwin python
-    PATHS
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
-    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
-    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
-    )
+  if (DEFINED ENV{VIRTUAL_ENV})
+    find_program(PYTHON_EXECUTABLE
+      NAMES python.exe
+      PATHS
+      "$ENV{VIRTUAL_ENV}\\scripts"
+      NO_DEFAULT_PATH
+      )
+  else()
+    find_program(PYTHON_EXECUTABLE
+      NAMES python25.exe python23.exe python.exe
+      NO_DEFAULT_PATH # added so that cmake does not find cygwin python
+      PATHS
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+      [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+      [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+      )
+  endif()
 
-
-elseif (EXISTS /etc/arch-release)
-  # On Archlinux, use Python 2
+elseif (EXISTS /usr/bin/python2)
+  # if this is there, use it
 
   find_program(PYTHON_EXECUTABLE python2 PATHS /usr/bin)
 

indra/cmake/Qt4.cmake

@@ -1,12 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-if (STANDALONE)
-  set(Qt4_FIND_REQUIRED ON)
-
-  include(FindQt4)
-
-  find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtNetwork QtOpenGL QtWebKit REQUIRED)
-  include(${QT_USE_FILE})
-  add_definitions(${QT_DEFINITIONS})
-endif (STANDALONE)

indra/cmake/QuickTimePlugin.cmake

@@ -1,46 +0,0 @@
-# -*- cmake -*-
-
-if(INSTALL_PROPRIETARY)
-  include(Prebuilt)
-  use_prebuilt_binary(quicktime)
-endif(INSTALL_PROPRIETARY)
-
-if (DARWIN)
-  include(CMakeFindFrameworks)
-  find_library(QUICKTIME_LIBRARY QuickTime)
-elseif (WINDOWS AND WORD_SIZE EQUAL 32)
-  set(QUICKTIME_SDK_DIR "$ENV{PROGRAMFILES}/QuickTime SDK"
-      CACHE PATH "Location of the QuickTime SDK.")
-
-  find_library(DEBUG_QUICKTIME_LIBRARY qtmlclient
-               PATHS
-               ${ARCH_PREBUILT_DIRS_DEBUG}
-               "${QUICKTIME_SDK_DIR}\\libraries"
-               )
-
-  find_library(RELEASE_QUICKTIME_LIBRARY qtmlclient
-               PATHS
-               ${ARCH_PREBUILT_DIRS_RELEASE}
-               "${QUICKTIME_SDK_DIR}\\libraries"
-               )
-
-  if (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
-    set(QUICKTIME_LIBRARY 
-        optimized ${RELEASE_QUICKTIME_LIBRARY}
-        debug ${DEBUG_QUICKTIME_LIBRARY}
-        )
-        
-  endif (DEBUG_QUICKTIME_LIBRARY AND RELEASE_QUICKTIME_LIBRARY)
-  
-  include_directories(
-    ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/quicktime
-    "${QUICKTIME_SDK_DIR}\\CIncludes"
-    )
-endif (DARWIN)
-
-mark_as_advanced(QUICKTIME_LIBRARY)
-
-if (QUICKTIME_LIBRARY)
-  set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
-endif (QUICKTIME_LIBRARY)
-

indra/cmake/RunBuildTest.cmake

@@ -1,20 +0,0 @@
-#This cmake script is meant to be run as a build time custom command.
-#The script is run using cmake w/ the -P option.
-# parameters are passed to this scripts execution with the -D option. 
-# A full command line would look like this:
-# cmake -D LD_LIBRARY_PATH=~/checkout/libraries -D TEST_CMD=./llunit_test -D ARGS=--touch=llunit_test_ok.txt -P RunBuildTest.cmake
-
-# Parameters:
-# LD_LIBRARY_PATH: string, What to set the LD_LIBRARY_PATH env var.
-# TEST_CMD: string list, command to run the unit test with, followed by its args.  
-set(ENV{LD_LIBRARY_PATH} ${LD_LIBRARY_PATH})
-#message("Running: ${TEST_CMD}")
-execute_process(
-  COMMAND ${TEST_CMD}
-  RESULT_VARIABLE RES
-  )
-
-if(NOT ${RES} STREQUAL 0)
-  message(STATUS "Failure running: ${TEST_CMD}") 
-  message(FATAL_ERROR "Error: ${RES}")
-endif(NOT ${RES} STREQUAL 0)

indra/cmake/TemplateCheck.cmake

@@ -8,7 +8,7 @@ macro (check_message_template _target)
       PRE_LINK
       COMMAND ${PYTHON_EXECUTABLE}
       ARGS ${SCRIPTS_DIR}/template_verifier.py
-           --mode=development --cache_master
-      COMMENT "Verifying message template"
+           --mode=development --cache_master --master_url=${TEMPLATE_VERIFIER_MASTER_URL} ${TEMPLATE_VERIFIER_OPTIONS}
+      COMMENT "Verifying message template - See http://wiki.secondlife.com/wiki/Template_verifier.py"
       )
 endmacro (check_message_template)

indra/cmake/UI.cmake

@@ -1,10 +1,9 @@
 # -*- cmake -*-
-include(Prebuilt)
+include(FreeType)
 
-if (STANDALONE)
+if (LINUX)
   include(FindPkgConfig)
-    
-  if (LINUX)
+
     set(PKGCONFIG_PACKAGES
         atk
         cairo
@@ -20,8 +19,8 @@ if (STANDALONE)
         pangox
         pangoxft
         sdl
+        x11
         )
-  endif (LINUX)
 
   foreach(pkg ${PKGCONFIG_PACKAGES})
     pkg_check_modules(${pkg} REQUIRED ${pkg})
@@ -30,40 +29,6 @@ if (STANDALONE)
     list(APPEND UI_LIBRARIES ${${pkg}_LIBRARIES})
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
-else (STANDALONE)
-  if (LINUX)
-    use_prebuilt_binary(glib)		# gtk-etc needs glib
-    use_prebuilt_binary(gtk-atk-pango-glib)
-    set(UI_LIBRARIES
-        atk-1.0
-        X11
-        gdk-x11-2.0
-        gdk_pixbuf-2.0
-        Xinerama
-        glib-2.0
-        gio-2.0
-        gmodule-2.0
-        gobject-2.0
-        gthread-2.0
-        gtk-x11-2.0
-        pango-1.0
-        pangoft2-1.0
-        pangox-1.0
-        pangoxft-1.0
-        pangocairo-1.0
-        )
-  endif (LINUX)
 
-  include_directories (
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1
-      )
-  foreach(include ${${LL_ARCH}_INCLUDES})
-      include_directories(${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/${include})
-  endforeach(include)
-endif (STANDALONE)
-
-if (LINUX)
   add_definitions(-DLL_GTK=1 -DLL_X11=1)
 endif (LINUX)

indra/cmake/URIPARSER.cmake

@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+set(URIPARSER_FIND_QUIETLY ON)
+set(URIPARSER_FIND_REQUIRED ON)
+
+include(Prebuilt)
+
+if (USESYSTEMLIBS)
+  include(FindURIPARSER)
+else (USESYSTEMLIBS)
+  use_prebuilt_binary(uriparser)
+  if (WINDOWS)
+    set(URIPARSER_LIBRARY
+      debug uriparserd
+      optimized uriparser)
+  elseif (DARWIN OR LINUX)
+    set(URIPARSER_LIBRARY uriparser)
+  endif (WINDOWS)
+  set(URIPARSER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/uriparser)
+endif (USESYSTEMLIBS)

indra/cmake/UnixInstall.cmake

@@ -11,6 +11,6 @@ if (INSTALL)
     set(APP_BIN_DIR bin)
   endif(NOT APP_BIN_DIR)
   if(NOT APP_SHARE_DIR)
-    set(APP_SHARE_DIR share/secondlife-${viewer_VERSION})
+    set(APP_SHARE_DIR share/secondlife-${${ROOT_PROJECT_NAME}_VERSION})
   endif(NOT APP_SHARE_DIR)
 endif (INSTALL)

indra/cmake/Variables.cmake

@@ -9,9 +9,7 @@
 #   LINUX   - Linux
 #   WINDOWS - Windows
 
-
 # Relative and absolute paths to subtrees.
-
 if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
 set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
 
@@ -19,63 +17,153 @@ 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)
+option(GEN_IS_MULTI_CONFIG "" ${_isMultiConfig})
+mark_as_advanced(GEN_IS_MULTI_CONFIG)
+
 set(LIBS_CLOSED_PREFIX)
 set(LIBS_OPEN_PREFIX)
 set(SCRIPTS_PREFIX ../scripts)
 set(VIEWER_PREFIX)
+set(INTEGRATION_TESTS_PREFIX)
 
-set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
-set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
-set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
-set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_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 global and interprocedural optimizations" OFF)
+
+# Configure crash reporting
+option(USE_CRASHPAD "Build support for crashpad reporting engine" OFF)
+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")
+
+# Mallocs
 set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds automatically disable TCMalloc)")
-set(LL_TESTS OFF CACHE BOOL "Build and run unit and integration tests (disable for build timing runs to reduce variation)")
 set(DISABLE_FATAL_WARNINGS TRUE CACHE BOOL "Set this to FALSE to enable fatal warnings.")
 
-set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH
+# Audio Engines
+option(USE_FMODSTUDIO "Build with support for the FMOD Studio audio engine" OFF)
+
+# Proprietary Library Features
+option(USE_NVAPI "Use nvapi driver interface library" OFF)
+
+
+if(LIBS_CLOSED_DIR)
+  file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
+else(LIBS_CLOSED_DIR)
+  set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
+endif(LIBS_CLOSED_DIR)
+if(LIBS_COMMON_DIR)
+  file(TO_CMAKE_PATH "${LIBS_COMMON_DIR}" LIBS_COMMON_DIR)
+else(LIBS_COMMON_DIR)
+  set(LIBS_COMMON_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
+endif(LIBS_COMMON_DIR)
+set(LIBS_OPEN_DIR ${LIBS_COMMON_DIR})
+
+set(SCRIPTS_DIR ${CMAKE_SOURCE_DIR}/${SCRIPTS_PREFIX})
+set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX})
+
+set(AUTOBUILD_INSTALL_DIR ${CMAKE_BINARY_DIR}/packages)
+
+set(LIBS_PREBUILT_DIR ${AUTOBUILD_INSTALL_DIR} CACHE PATH
     "Location of prebuilt libraries.")
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake)
+  # We use this as a marker that you can try to use the proprietary libraries.
+  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://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
+      "Build type.  One of: Debug Release RelWithDebInfo" FORCE)
+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.
+if (ADDRESS_SIZE EQUAL 32)
+  #message(STATUS "ADDRESS_SIZE is 32")
+  set(ARCH i686)
+elseif (ADDRESS_SIZE EQUAL 64)
+  #message(STATUS "ADDRESS_SIZE is 64")
+  set(ARCH x86_64)
+else (ADDRESS_SIZE EQUAL 32)
+    #message(STATUS "ADDRESS_SIZE is UNDEFINED")
+    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+      message(STATUS "Size of void pointer is detected as 8; ARCH is 64-bit")
+      set(ARCH x86_64)
+      set(ADDRESS_SIZE 64)
+    elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
+      message(STATUS "Size of void pointer is detected as 4; ARCH is 32-bit")
+      set(ADDRESS_SIZE 32)
+      set(ARCH i686)
+    else()
+      message(FATAL_ERROR "Unkown Architecture!")
+    endif()
+endif (ADDRESS_SIZE EQUAL 32)
+
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
   set(WINDOWS ON BOOL FORCE)
-  if (WORD_SIZE EQUAL 32)
-    set(ARCH i686)
+  if (ADDRESS_SIZE EQUAL 64)
+    set(LL_ARCH ${ARCH}_win64)
+    set(LL_ARCH_DIR ${ARCH}-win64)
+  elseif (ADDRESS_SIZE EQUAL 32)
     set(LL_ARCH ${ARCH}_win32)
     set(LL_ARCH_DIR ${ARCH}-win32)
-  elseif (WORD_SIZE EQUAL 64)
-    set(ARCH x86_64)
-    set(LL_ARCH ${ARCH}_win)
-    set(LL_ARCH_DIR ${ARCH}-win)
-  endif (WORD_SIZE EQUAL 32)
-endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+  else()
+    message(FATAL_ERROR "Unkown Architecture!")
+  endif ()
+endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  set(LINUX ON BOOl FORCE)
+  set(LINUX ON BOOL FORCE)
 
-  # If someone has specified a word size, use that to determine the
-  # architecture.  Otherwise, let the architecture specify the word size.
-  if (WORD_SIZE EQUAL 32)
-    set(ARCH i686)
-  elseif (WORD_SIZE EQUAL 64)
-    set(ARCH x86_64)
-  else (WORD_SIZE EQUAL 32)
-    if(CMAKE_SIZEOF_VOID_P MATCHES 4)
-      set(ARCH i686)
-      set(WORD_SIZE 32)
-    else(CMAKE_SIZEOF_VOID_P MATCHES 4)
-      set(ARCH x86_64)
-      set(WORD_SIZE 64)
-    endif(CMAKE_SIZEOF_VOID_P MATCHES 4)
-  endif (WORD_SIZE EQUAL 32)
-
-  if (NOT STANDALONE AND MULTIARCH_HACK)
-    if (WORD_SIZE EQUAL 32)
+  if (ADDRESS_SIZE EQUAL 32)
       set(DEB_ARCHITECTURE i386)
       set(FIND_LIBRARY_USE_LIB64_PATHS OFF)
       set(CMAKE_SYSTEM_LIBRARY_PATH /usr/lib32 ${CMAKE_SYSTEM_LIBRARY_PATH})
-    else (WORD_SIZE EQUAL 32)
+  else (ADDRESS_SIZE EQUAL 32)
       set(DEB_ARCHITECTURE amd64)
       set(FIND_LIBRARY_USE_LIB64_PATHS ON)
-    endif (WORD_SIZE EQUAL 32)
+  endif (ADDRESS_SIZE EQUAL 32)
 
     execute_process(COMMAND dpkg-architecture -a${DEB_ARCHITECTURE} -qDEB_HOST_MULTIARCH 
         RESULT_VARIABLE DPKG_RESULT
@@ -88,66 +176,107 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     endif (DPKG_RESULT EQUAL 0)
 
     include(ConfigurePkgConfig)
-  endif (NOT STANDALONE AND MULTIARCH_HACK)
 
   set(LL_ARCH ${ARCH}_linux)
   set(LL_ARCH_DIR ${ARCH}-linux)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(DARWIN 1)
+  set(DARWIN ON BOOL FORCE)
 
-  if(${CMAKE_GENERATOR} MATCHES "Xcode")
-    #SDK Compiler and Deployment targets for XCode
-    if (${XCODE_VERSION} VERSION_LESS 4.0.0)
-      set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
-    else (${XCODE_VERSION} VERSION_LESS 4.0.0)
-      set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
-      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
-    endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
-  else(${CMAKE_GENERATOR} MATCHES "Xcode")
-    set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
-  endif(${CMAKE_GENERATOR} MATCHES "Xcode")
+  # Architecture
+  set(CMAKE_OSX_SYSROOT macosx10.14)
+  set(CMAKE_OSX_ARCHITECTURES "x86_64")
+  set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS "x86_64")
 
-  set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+  # Build Options
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0")
+  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT[variant=Debug] "dwarf")
+  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT[variant=Release] "dwarf-with-dsym")
 
-  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym)
+  # Deployment
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
 
-  # Build only for i386 by default, system default on MacOSX 10.6 is x86_64
-  set(CMAKE_OSX_ARCHITECTURES i386)
-  set(ARCH i386)
-  set(WORD_SIZE 32)
+  # Linking 
+  set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING YES)
+
+  # Apple Clang - Code Gen
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS[variant=Release] YES)
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_X86_VECTOR_INSTRUCTIONS sse4.1)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL[variant=Debug] 0)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL[variant=Release] 3)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_FAST_MATH NO)
+
+  # Apple Clang - Custom Compiler Flags
+  set(CMAKE_XCODE_ATTRIBUTE_WARNING_CFLAGS "-Wall -Wextra -Wno-reorder -Wno-sign-compare -Wno-ignored-qualifiers -Wno-unused-local-typedef -Wno-unused-parameter")
+
+  # Apple Clang - Language - C++
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD c++14)
+  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+
+  # Apple Clang - Warning Policies
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_TREAT_WARNINGS_AS_ERRORS YES)
 
   set(LL_ARCH ${ARCH}_darwin)
   set(LL_ARCH_DIR universal-darwin)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
-if (WINDOWS AND WORD_SIZE EQUAL 32)
-  set(PREBUILT_TYPE windows)
-elseif (WINDOWS AND WORD_SIZE EQUAL 64)
-  set(PREBUILT_TYPE windows64)
-elseif(DARWIN)
-  set(PREBUILT_TYPE darwin)
-elseif(LINUX AND WORD_SIZE EQUAL 32)
-  set(PREBUILT_TYPE linux)
-elseif(LINUX AND WORD_SIZE EQUAL 64)
-  set(PREBUILT_TYPE linux64)
-endif(WINDOWS AND WORD_SIZE EQUAL 32)
+# 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_CHANNEL "Singularity" CACHE STRING "Viewer Channel Name")
-set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
-set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id (currently secondlife|snowglobe)")
+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()
 
-# *TODO: break out proper Branding-secondlife.cmake, Branding-snowglobe.cmake, etc
-set(VIEWER_BRANDING_NAME "Singularity")
-set(VIEWER_BRANDING_NAME_CAMELCASE "Singularity")
+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()
 
-set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
+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.")
+
+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_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") # "β"
+  else()
+    set(VIEWER_CHANNEL_GRK "")
+  endif ()
+endif (NOT VIEWER_CHANNEL_GRK)
+
+option(ENABLE_SIGNING "Enable signing the viewer" OFF)
+set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")
 
 source_group("CMake Rules" FILES CMakeLists.txt)
 

indra/cmake/ViewerMiscLibs.cmake

@@ -2,14 +2,7 @@
 include(Prebuilt)
 
 if (NOT STANDALONE)
-  use_prebuilt_binary(vivox)
-  if(LINUX)
-	use_prebuilt_binary(libuuid)
-    if (${ARCH} STREQUAL "x86_64")
-     use_prebuilt_binary(32bitcompatibilitylibs)
-	endif (${ARCH} STREQUAL "x86_64")
-    use_prebuilt_binary(fontconfig)
-  endif(LINUX)
+  use_prebuilt_binary(slvoice)
 else (NOT STANDALONE)
   # Download there even when using standalone.
   set(STANDALONE OFF)
@@ -19,3 +12,10 @@ else (NOT STANDALONE)
   endif(LINUX AND ${ARCH} STREQUAL "x86_64")
   set(STANDALONE ON)
 endif(NOT STANDALONE)
+
+if(LINUX)
+  include(FindPkgConfig)
+  pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
+endif(LINUX)
+
+use_prebuilt_binary(fonts)

indra/cmake/WebKitLibPlugin.cmake

@@ -1,62 +0,0 @@
-# -*- cmake -*-
-include(Linking)
-include(Prebuilt)
-include(LLQtWebkit)
-include(Qt4)
-
-if (STANDALONE)
-    set(WEBKITLIBPLUGIN OFF CACHE BOOL
-        "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
-else (STANDALONE)
-    use_prebuilt_binary(llqtwebkit)
-    set(WEBKITLIBPLUGIN ON CACHE BOOL
-        "WEBKITLIBPLUGIN support for the llplugin/llmedia test apps.")
-endif (STANDALONE)
-
-if (WINDOWS)
-    set(WEBKIT_PLUGIN_LIBRARIES 
-    debug llqtwebkitd
-    debug QtWebKitd4
-    debug QtOpenGLd4
-    debug QtNetworkd4
-    debug QtGuid4
-    debug QtCored4
-    debug qtmaind
-    optimized llqtwebkit
-    optimized QtWebKit4
-    optimized QtOpenGL4
-    optimized QtNetwork4
-    optimized QtGui4
-    optimized QtCore4
-    optimized qtmain
-    )
-elseif (DARWIN)
-    set(WEBKIT_PLUGIN_LIBRARIES
-        optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
-        debug ${ARCH_PREBUILT_DIRS_DEBUG}/libllqtwebkit.dylib
-        )
-elseif (LINUX)
-     if (STANDALONE)
-       set(WEBKIT_PLUGIN_LIBRARIES ${LLQTWEBKIT_LIBRARY} ${QT_LIBRARIES} ${QT_PLUGIN_LIBRARIES})
-     else (STANDALONE)
-       set(WEBKIT_PLUGIN_LIBRARIES
-        llqtwebkit
-        QtWebKit
-        QtOpenGL
-        QtNetwork
-        QtGui
-        QtCore
-        crypto
-        ssl
-#       qgif
-#       qjpeg
-        jscore
-        jpeg
-        fontconfig
-        X11
-        Xrender
-        Xext
-        GL
-        )
-     endif (STANDALONE)
-endif (WINDOWS)

indra/cmake/WinManifest.cmake

@@ -0,0 +1,17 @@
+# - Embeds a specific manifest file in a Windows binary
+# Defines the following:
+# EMBED_MANIFEST - embed manifest in a windows binary with mt
+# Parameters - _target is the target file, type - 1 for EXE, 2 for DLL
+
+  MACRO(EMBED_MANIFEST _target type)
+    ADD_CUSTOM_COMMAND(
+      TARGET ${_target}
+      POST_BUILD
+      COMMAND "mt.exe"
+      ARGS
+        -manifest \"${CMAKE_SOURCE_DIR}\\tools\\manifests\\compatibility.manifest\"
+        -inputresource:\"$<TARGET_FILE:${_target}>\"\;\#${type}
+        -outputresource:\"$<TARGET_FILE:${_target}>\"\;\#${type}
+      COMMENT "Adding compatibility manifest to ${_target}"
+    )
+  ENDMACRO(EMBED_MANIFEST _target type)

indra/cmake/XmlRpcEpi.cmake

@@ -8,6 +8,13 @@ if (STANDALONE)
   include(FindXmlRpcEpi)
 else (STANDALONE)
     use_prebuilt_binary(xmlrpc-epi)
-    set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
-    set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
+    if (WINDOWS)
+        set(XMLRPCEPI_LIBRARIES
+            debug xmlrpc-epid
+            optimized xmlrpc-epi
+        )
+    else (WINDOWS)
+        set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
+    endif (WINDOWS)
+    set(XMLRPCEPI_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
 endif (STANDALONE)

indra/cmake/ZLIB.cmake

@@ -13,10 +13,25 @@ else (STANDALONE)
     set(ZLIB_LIBRARIES 
       debug zlibd
       optimized zlib)
+  elseif (LINUX)
+    #
+    # When we have updated static libraries in competition with older
+    # shared libraries and we want the former to win, we need to do some
+    # extra work.  The *_PRELOAD_ARCHIVES settings are invoked early
+    # and will pull in the entire archive to the binary giving it 
+    # priority in symbol resolution.  Beware of cmake moving the
+    # achive load itself to another place on the link command line.  If
+    # that happens, you can try something like -Wl,-lz here to hide
+    # the archive.  Also be aware that the linker will not tolerate a
+    # second whole-archive load of the archive.  See viewer's
+    # CMakeLists.txt for more information.
+    #
+    set(ZLIB_PRELOAD_ARCHIVES -Wl,--whole-archive z -Wl,--no-whole-archive)
+    set(ZLIB_LIBRARIES z)
   else (WINDOWS)
     set(ZLIB_LIBRARIES z)
   endif (WINDOWS)
   if (WINDOWS OR LINUX)
-    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/zlib)
+    set(ZLIB_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/zlib)
   endif (WINDOWS OR LINUX)
 endif (STANDALONE)

indra/cmake/cmake_dummy.cpp

@@ -1,30 +1,24 @@
 /** 
  * @file cmake_dummy.cpp
  *
- * $LicenseInfo:firstyear=2008&license=viewergpl$
- * 
- * Copyright (c) 2008-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2008&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$
  */

indra/cmake/run_build_test.py

@@ -0,0 +1,340 @@
+#!/usr/bin/env python2
+"""\
+@file   run_build_test.py
+@author Nat Goodspeed
+@date   2009-09-03
+@brief  Helper script to allow CMake to run some command after setting
+        environment variables.
+
+CMake has commands to run an external program. But remember that each CMake
+command must be backed by multiple build-system implementations. Unfortunately
+it seems CMake can't promise that every target build system can set specified
+environment variables before running the external program of interest.
+
+This helper script is a workaround. It simply sets the requested environment
+variables and then executes the program specified on the rest of its command
+line.
+
+Example:
+
+python run_build_test.py -DFOO=bar myprog somearg otherarg
+
+sets environment variable FOO=bar, then runs:
+myprog somearg otherarg
+
+$LicenseInfo:firstyear=2009&license=viewerlgpl$
+Second Life Viewer Source Code
+Copyright (C) 2009-2010, 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$
+"""
+
+import os
+import sys
+import errno
+import HTMLParser
+import re
+import signal
+import subprocess
+import logging
+
+def main(command, arguments=[], libpath=[], vars={}):
+    """Pass:
+    command is the command to be executed
+
+    argument is a sequence (e.g. a list) of strings to be passed to command
+
+    libpath is a sequence of directory pathnames. These will be appended to
+    the platform-specific dynamic library search path environment variable.
+
+    vars is a dict of arbitrary (var, value) pairs to be added to the
+    environment before running 'command'.
+
+    This function runs the specified command, waits for it to terminate and
+    returns its return code. This will be negative if the command terminated
+    with a signal, else it will be the process's specified exit code.
+    """
+    # Handle platform-dependent libpath first.
+    if sys.platform == "win32":
+        lpvars = ["PATH"]
+    elif sys.platform == "darwin":
+        lpvars = ["LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH"]
+    elif sys.platform.startswith("linux"):
+        lpvars = ["LD_LIBRARY_PATH"]
+    else:
+        # No idea what the right pathname might be! But only crump if this
+        # feature is requested.
+        if libpath:
+            raise RuntimeError("run_build_test: unknown platform %s" % sys.platform)
+        lpvars = []
+    for var in lpvars:
+        # Split the existing path. Bear in mind that the variable in question
+        # might not exist; instead of KeyError, just use an empty string.
+        dirs = os.environ.get(var, "").split(os.pathsep)
+        # Append the sequence in libpath
+        log.info("%s += %r" % (var, libpath))
+        for dir in libpath:
+            # append system paths at the end
+            if dir in ('/lib', '/usr/lib'):
+                dirs.append(dir)
+            # prepend non-system paths
+            else:
+                dirs.insert(0, dir)
+
+        # Filter out some useless pieces
+        clean_dirs = []
+        for dir in dirs:
+            if dir and dir not in ('', '.'):
+                clean_dirs.append(dir)
+
+        # Now rebuild the path string. This way we use a minimum of separators
+        # -- and we avoid adding a pointless separator when libpath is empty.
+        os.environ[var] = os.pathsep.join(clean_dirs)
+        log.info("%s = %r" % (var, os.environ[var]))
+    # Now handle arbitrary environment variables. The tricky part is ensuring
+    # that all the keys and values we try to pass are actually strings.
+    if vars:
+         log.info("Setting: %s" % ("\n".join(["%s=%s" % (key, value) for key, value in vars.iteritems()])))
+    os.environ.update(dict([(str(key), str(value)) for key, value in vars.iteritems()]))
+    # Run the child process.
+    command_list = [command]
+    command_list.extend(arguments)
+    log.info("Running: %s" % " ".join(command_list))
+    # Make sure we see all relevant output *before* child-process output.
+    sys.stdout.flush()
+    try:
+        return subprocess.call(command_list)
+    except OSError as err:
+        # If the caller is trying to execute a test program that doesn't
+        # exist, we want to produce a reasonable error message rather than a
+        # traceback. This happens when the build is halted by errors, but
+        # CMake tries to proceed with testing anyway <eyeroll/>. However, do
+        # NOT attempt to handle any error but "doesn't exist."
+        if err.errno != errno.ENOENT:
+            raise
+        # In practice, the pathnames into CMake's build tree are so long as to
+        # obscure the name of the test program. Just log its basename.
+        log.warn("No such program %s; check for preceding build errors" % \
+                 os.path.basename(command[0]))
+        # What rc should we simulate for missing executable? Windows produces
+        # 9009.
+        return 9009
+
+# swiped from vita, sigh, seems like a Bad Idea to introduce dependency
+def translate_rc(rc):
+    """
+    Accept an rc encoded as for subprocess.Popen.returncode:
+    None means still running
+    int >= 0 means terminated voluntarily with specified rc
+    int <  0 means terminated by signal (-rc)
+
+    Return a string explaining the outcome. In case of a signal, try to
+    name the corresponding symbol from the 'signal' module.
+    """
+    if rc is None:
+        return "still running"
+    
+    if rc >= 0:
+        return "terminated with rc %s" % rc
+
+    if sys.platform.startswith("win"):
+        # From http://stackoverflow.com/questions/20629027/process-finished-with-exit-code-1073741571
+        # [-1073741571] is the signed integer representation of Microsoft's
+        # "stack overflow/stack exhaustion" error code 0xC00000FD.
+        # Anytime you see strange, large negative exit codes in windows, convert
+        # them to hex and then look them up in the ntstatus error codes
+        # http://msdn.microsoft.com/en-us/library/cc704588.aspx
+
+        # Python bends over backwards to give you all the integer precision
+        # you need, avoiding truncation. But only with 32-bit signed ints is
+        # -1073741571 equivalent to 0xC00000FD! Explicitly truncate before
+        # converting.
+        hexrc = "0x%X" % (rc & 0xFFFFFFFF)
+        # At this point, we're only trying to format the rc to make it easier
+        # for a human being to understand. Any exception here -- file doesn't
+        # exist, HTML parsing error, unrecognized table structure, unknown key
+        # -- should NOT kill the script! It should only cause us to shrug and
+        # present our caller with the best information available.
+        try:
+            table = get_windows_table()
+            symbol, desc = table[hexrc]
+        except Exception, err:
+            log.error("(%s -- carrying on)" % err)
+            log.error("terminated with rc %s (%s)" % (rc, hexrc))
+        else:
+            log.info("terminated with rc %s: %s: %s" % (hexrc, symbol, desc))
+
+    else:
+        # On Posix, negative rc means the child was terminated by signal -rc.
+        rc = -rc
+        for attr in dir(signal):
+            if attr.startswith('SIG') and getattr(signal, attr) == rc:
+                strc = attr
+                break
+        else:
+            strc = str(rc)
+        return "terminated by signal %s" % strc
+
+class TableParser(HTMLParser.HTMLParser):
+    """
+    This HTMLParser subclass is designed to parse the table we know exists
+    in windows-rcs.html, hopefully without building in too much knowledge of
+    the specific way that table is currently formatted.
+    """
+    # regular expression matching any string containing only whitespace
+    whitespace = re.compile(r'\s*$')
+
+    def __init__(self):
+        # Because Python 2.x's HTMLParser is an old-style class, we must use
+        # old-style syntax to forward the __init__() call -- not super().
+        HTMLParser.HTMLParser.__init__(self)
+        # this will collect all the data, eventually
+        self.table = []
+        # Stack whose top (last item) indicates where to append current
+        # element data. When empty, don't collect data at all.
+        self.dest = []
+
+    def handle_starttag(self, tag, attrs):
+        if tag == "table":
+            # This is the outermost tag we recognize. Collect nested elements
+            # within self.table.
+            self.dest.append(self.table)
+        elif tag in ("tr", "td"):
+            # Nested elements whose contents we want to capture as sublists.
+            # To the list currently designated by the top of the dest stack,
+            # append a new empty sublist.
+            self.dest[-1].append([])
+            # Now push THAT new, empty list as the new top of the dest stack.
+            self.dest.append(self.dest[-1][-1])
+        elif tag == "p":
+            # We could handle <p> ... </p> just like <tr> or <td>, but that
+            # introduces an unnecessary extra level of nesting. Just skip.
+            pass
+        else:
+            # For any tag we don't recognize (notably <th>), push a new, empty
+            # list to the top of the dest stack. This new list is NOT
+            # referenced by anything in self.table; thus, when we pop it, any
+            # data we've collected inside that list will be discarded.
+            self.dest.append([])
+
+    def handle_endtag(self, tag):
+        # Because we avoid pushing self.dest for <p> in handle_starttag(), we
+        # must refrain from popping it for </p> here.
+        if tag != "p":
+            # For everything else, including unrecognized tags, pop the dest
+            # stack, reverting to outer collection.
+            self.dest.pop()
+
+    def handle_startendtag(self, tag, attrs):
+        # The table of interest contains <td> entries of the form:
+        # <p>0x00000000<br />STATUS_SUCCESS</p>
+        # The <br/> is very useful -- we definitely want two different data
+        # items for "0x00000000" and "STATUS_SUCCESS" -- but we don't need or
+        # want it to push, then discard, an empty list as it would if we let
+        # the default HTMLParser.handle_startendtag() call handle_starttag()
+        # followed by handle_endtag(). Just ignore <br/> or any other
+        # singleton tag.
+        pass
+
+    def handle_data(self, data):
+        # Outside the <table> of interest, self.dest is empty. Do not bother
+        # collecting data when self.dest is empty.
+        # HTMLParser calls handle_data() with every chunk of whitespace
+        # between tags. That would be lovely if our eventual goal was to
+        # reconstitute the original input stream with its existing formatting,
+        # but for us, whitespace only clutters the table. Ignore it.
+        if self.dest and not self.whitespace.match(data):
+            # Here we're within our <table> and we have non-whitespace data.
+            # Append it to the list designated by the top of the dest stack.
+            self.dest[-1].append(data)
+
+# cache for get_windows_table()
+_windows_table = None
+
+def get_windows_table():
+    global _windows_table
+    # If we already loaded _windows_table, no need to load it all over again.
+    if _windows_table:
+        return _windows_table
+
+    # windows-rcs.html was fetched on 2015-03-24 with the following command:
+    # curl -o windows-rcs.html \
+    #         https://msdn.microsoft.com/en-us/library/cc704588.aspx
+    parser = TableParser()
+    with open(os.path.join(os.path.dirname(__file__), "windows-rcs.html")) as hf:
+        # We tried feeding the file data to TableParser in chunks, to avoid
+        # buffering the entire file as a single string. Unfortunately its
+        # handle_data() cannot tell the difference between distinct calls
+        # separated by HTML tags, and distinct calls necessitated by a chunk
+        # boundary. Sigh! Read in the whole file. At the time this was
+        # written, it was only 500KB anyway.
+        parser.feed(hf.read())
+    parser.close()
+    table = parser.table
+
+    # With our parser, any <tr><th>...</th></tr> row leaves a table entry
+    # consisting only of an empty list. Remove any such.
+    while table and not table[0]:
+        table.pop(0)
+
+    # We expect rows of the form:
+    # [['0x00000000', 'STATUS_SUCCESS'],
+    #  ['The operation completed successfully.']]
+    # The latter list will have multiple entries if Microsoft embedded <br/>
+    # or <p> ... </p> in the text, in which case joining with '\n' is
+    # appropriate.
+    # Turn that into a dict whose key is the hex string, and whose value is
+    # the pair (symbol, desc).
+    _windows_table = dict((key, (symbol, '\n'.join(desc)))
+                          for (key, symbol), desc in table)
+
+    return _windows_table
+
+log=logging.getLogger(__name__)
+logging.basicConfig()
+
+if __name__ == "__main__":
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-d", "--debug", dest="loglevel", action="store_const",
+                        const=logging.DEBUG, default=logging.INFO)
+    parser.add_argument("-D", "--define", dest="vars", default=[], action="append",
+                        metavar="VAR=value",
+                        help="Add VAR=value to the env variables defined")
+    parser.add_argument("-l", "--libpath", dest="libpath", default=[], action="append",
+                        metavar="DIR",
+                        help="Add DIR to the platform-dependent DLL search path")
+    parser.add_argument("command")
+    parser.add_argument('args', nargs=argparse.REMAINDER)
+    args = parser.parse_args()
+
+    log.setLevel(args.loglevel)
+
+    # What we have in opts.vars is a list of strings of the form "VAR=value"
+    # or possibly just "VAR". What we want is a dict. We can build that dict by
+    # constructing a list of ["VAR", "value"] pairs -- so split each
+    # "VAR=value" string on the '=' sign (but only once, in case we have
+    # "VAR=some=user=string"). To handle the case of just "VAR", append "" to
+    # the list returned by split(), then slice off anything after the pair we
+    # want.
+    rc = main(command=args.command, arguments=args.args, libpath=args.libpath,
+              vars=dict([(pair.split('=', 1) + [""])[:2] for pair in args.vars]))
+    if rc not in (None, 0):
+        log.error("Failure running: %s" % " ".join([args.command] + args.args))
+        log.error("Error %s: %s" % (rc, translate_rc(rc)))
+    sys.exit((rc < 0) and 255 or rc)

indra/copy_win_scripts/start-client.py

@@ -1,4 +1,28 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
+"""\
+@file   start-client.py
+
+$LicenseInfo:firstyear=2010&license=viewerlgpl$
+Second Life Viewer Source Code
+Copyright (C) 2010-2011, 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$
+"""
 import sys, getopt
 import os
 import llstart

indra/cwdebug/debug.h

@@ -28,95 +28,16 @@
 #ifndef CWDEBUG
 
 #ifdef DEBUG_CURLIO
-
-// If CWDEBUG is not defined, but DEBUG_CURLIO is, then replace
-// some of the cwd macro's with something that generates viewer
-// specific debug output. Note that this generates a LOT of
-// output and should not normally be defined.
-
-#include <string>
-#include "llpreprocessor.h"
-
-namespace debug {
-namespace libcwd {
-
-struct buf2str {
-  buf2str(char const* buf, int size) : mBuf(buf), mSize(size) { }
-  char const* mBuf;
-  int mSize;
-};
-
-struct libcwd_do_type {
- void on() const { }
-};
-extern LL_COMMON_API libcwd_do_type const libcw_do;
-
-} // namespace libcwd
-
-enum print_thread_id_t { print_thread_id };
-inline void init() { }
-struct Indent {
-  int M_indent;
-  static ll_thread_local int S_indentation;
-  enum LL_COMMON_API print_nt { print };
-  LL_COMMON_API Indent(int indent);
-  LL_COMMON_API ~Indent();
-};
-
-extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
-extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, Indent::print_nt);
-extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, print_thread_id_t);
-
-namespace dc {
-
-struct fake_channel {
-  int mOn;
-  char const* mLabel;
-  fake_channel(int on, char const* label) : mOn(on), mLabel(label) { }
-  fake_channel(void) : mOn(0) { }
-  bool is_on() const { return !!mOn; }
-  bool is_off() const { return !mOn; }
-  void on() const { }
-  void off() const { }
-};
-extern LL_COMMON_API fake_channel const warning;
-extern LL_COMMON_API fake_channel const curl;
-extern LL_COMMON_API fake_channel const curlio;
-extern LL_COMMON_API fake_channel const curltr;
-extern LL_COMMON_API fake_channel const statemachine;
-extern LL_COMMON_API fake_channel const notice;
-extern LL_COMMON_API fake_channel const snapshot;
-
-} // namespace dc
-} // namespace debug
-
-#define LIBCWD_DEBUG_CHANNELS debug
-#define LibcwDoutScopeBegin(a, b, c) do { using namespace debug; using namespace debug::libcwd; llinfos_nf << print_thread_id << (c).mLabel << ": " << Indent::print;
-#define LibcwDoutStream llcont
-#define LibcwDoutScopeEnd llcont << llendl; } while(0)
-
-#define Debug(x) do { using namespace debug; using namespace debug::libcwd; x; } while(0)
-#define Dout(a, b) do { using namespace debug; using namespace debug::libcwd; if ((a).mOn) { llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
-#define DoutEntering(a, b) \
-  int __slviewer_debug_indentation = 2; \
-  { \
-	using namespace debug; \
-	using namespace debug::libcwd; \
-	if ((a).mOn) \
-	  llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << "Entering " << b << llendl; \
-    else \
-	  __slviewer_debug_indentation = 0; \
-  } \
-  debug::Indent __slviewer_debug_indent(__slviewer_debug_indentation);
-
-#else // !DEBUG_CURLIO
+#error DEBUG_CURLIO is not supported without libcwd.
+// In order to use DEBUG_CURLIO you must install and use libcwd.
+// Download libcwd:
+// git clone https://github.com/CarloWood/libcwd.git
+#endif
 
 #define Debug(x)
 #define Dout(a, b)
 #define DoutEntering(a, b)
 
-#endif // !DEBUG_CURLIO
-
 #ifndef DOXYGEN         // No need to document this.  See http://libcwd.sourceforge.net/ for more info.
 
 #include <iostream>
@@ -144,7 +65,11 @@ extern LL_COMMON_API fake_channel const snapshot;
 #define CWDEBUG_MARKER 0
 
 #define BACKTRACE do { } while(0)
+#ifdef DEBUG_CURLIO
+#define CWD_ONLY(...) __VA_ARGS__
+#else
 #define CWD_ONLY(...)
+#endif
 
 #endif // !DOXYGEN
 
@@ -386,6 +311,40 @@ void InstanceTracker<T>::dump(void)
 
 } // namespace debug
 
+template<class T>
+class AIDebugInstanceCounter
+{
+  public:
+	static int sInstanceCount;
+
+  protected:
+	static void print_count(char const* name, int count, bool destruction);
+
+	AIDebugInstanceCounter()
+	{
+	  print_count(typeid(T).name(), ++sInstanceCount, false);
+	}
+	AIDebugInstanceCounter(AIDebugInstanceCounter const&)
+	{
+	  print_count(typeid(T).name(), ++sInstanceCount, false);
+	}
+	~AIDebugInstanceCounter()
+	{
+	  print_count(typeid(T).name(), --sInstanceCount, true);
+	}
+};
+
+//static
+template<class T>
+int AIDebugInstanceCounter<T>::sInstanceCount;
+
+//static
+template<class T>
+void AIDebugInstanceCounter<T>::print_count(char const* name, int count, bool destruction)
+{
+  Dout(dc::notice, (destruction ? "Destructed " : "Constructing ") << name << ", now " << count << " instance" << ((count == 1) ? "." : "s."));
+}
+
 //! Debugging macro.
 //
 // Print "Entering " << \a data to channel \a cntrl and increment

indra/deps/CMakeLists.txt

@@ -0,0 +1,62 @@
+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.11.0
+  GIT_SHALLOW    TRUE
+  )
+FetchContent_Declare(
+  fmt
+  GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+  GIT_TAG        8d78045e7cb44d39ad4cd95dd27816b8749e1944
+  )
+FetchContent_Declare(
+  nlohmann_json
+  GIT_REPOSITORY https://github.com/nlohmann/json.git
+  GIT_TAG        v3.7.3
+  GIT_SHALLOW    TRUE
+  )
+FetchContent_Declare(
+  absl
+  GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
+  GIT_TAG        768eb2ca2857342673fcd462792ce04b8bac3fa3
+)
+
+# This is a hack because absl has dumb cmake
+set(OLD_BUILD_TEST ${BUILD_TESTING})
+set(BUILD_TESTING OFF)
+FetchContent_MakeAvailable(absl)
+set(BUILD_TESTING ${OLD_BUILD_TEST})
+
+# Supress warnings inside abseil under MSVC
+if(WINDOWS)
+  target_compile_options(absl_strings PRIVATE /wd4018)
+  target_compile_options(absl_str_format_internal PRIVATE /wd4018)
+  target_compile_options(absl_flags_usage_internal PRIVATE /wd4018)
+endif()
+
+
+if (BUILD_TESTING)
+  FetchContent_MakeAvailable(Catch2)
+endif()
+
+#Download the rest of the libraries
+FetchContent_MakeAvailable(fmt)
+
+# Typically you don't care so much for a third party library's tests to be
+# run from your own project's code.
+set(JSON_BuildTests OFF CACHE INTERNAL "")
+
+# If you only include this third party in PRIVATE source files, you do not
+# need to install it when your main project gets installed.
+set(JSON_Install OFF CACHE INTERNAL "")
+FetchContent_MakeAvailable(nlohmann_json)
+
+unset(CMAKE_FOLDER)
+unset(CMAKE_POSITION_INDEPENDENT_CODE)