From b50df60aa180e904aa0733bb60cef91cf9df6ff6 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Thu, 21 Apr 2016 16:13:39 -0700
Subject: DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the
 viewer

---
 indra/test/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/test/CMakeLists.txt')

diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 229cb8e5a0..8bde5bda63 100755
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -104,7 +104,6 @@ target_link_libraries(lltest
     ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_SYSTEM_LIBRARY}
     ${DL_LIBRARY}
-    ${GOOGLE_PERFTOOLS_LIBRARIES}
     )
 
 if (WINDOWS)
-- 
cgit v1.2.3


From 870008f15b60399af6971ea746bcf7a05a8ea1db Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 14 Dec 2017 19:33:10 -0500
Subject: MAINT-8087: New LLDir_Win32 code requires ole32 in a few more places.

---
 indra/test/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/test/CMakeLists.txt')

diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 8344cead57..3f12431acc 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -73,6 +73,9 @@ if (NOT WINDOWS)
   list(APPEND test_SOURCE_FILES
        llmessagetemplateparser_tut.cpp
        )
+  set(EXTRA_WINDOWS_LIBRARIES "")
+else (NOT WINDOWS)
+  set(EXTRA_WINDOWS_LIBRARIES ole32)
 endif (NOT WINDOWS)
 
 set_source_files_properties(${test_HEADER_FILES}
@@ -96,6 +99,7 @@ target_link_libraries(lltest
     ${GOOGLEMOCK_LIBRARIES}
     ${PTHREAD_LIBRARY}
     ${WINDOWS_LIBRARIES}
+    ${EXTRA_WINDOWS_LIBRARIES}
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
     ${BOOST_COROUTINE_LIBRARY}
-- 
cgit v1.2.3


From 5002bf5660f41685fc0549880994f4b35440d535 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 20 Dec 2017 22:51:26 -0500
Subject: MAINT-8087: Use env vars from VMP for AppData\Roaming and Local.

On Windows, when logged in with a non-ASCII username, every one of the three
documented APIs -- SHGetSpecialFolderPath(), SHGetFolderPath() and
SHGetKnownFolderPath() -- fails to retrieve any pathname at all. We cannot
account for the fact that the oldest of these continues to work with the
release viewer and within a Python script (though not, curiously, from a
Python interactive session). With a non-ASCII username, they consistently fail
when called from an Alex Ivy viewer build: "The filename, directory name, or
volume label syntax is incorrect."

Empirically, with a non-ASCII username, the preset APPDATA and LOCALAPPDATA
environment variables are also useless, e.g. c:\Users\??????\AppData\Roaming
where those are, yup, actual question marks.

Empirically, the VMP is able to successfully call SHGetFolderPath() to
retrieve both AppData\Roaming and AppData\Local. Therefore, we make the VMP
set the APPDATA and LOCALAPPDATA environment variables to the UTF-8 encoded
correct pathnames. Instead of calling SHGetSomethingFolderPath() at all, make
LLDir_Win32 retrieve those environment variables.

Make LLFile::mkdir() treat "directory already exists" as a success case. Every
single call fell into one of two categories: either it didn't check success at
all, or it tested specially to exempt errno == EEXIST. Migrate that test into
mkdir(); eliminate it from call sites.

Make LLDir::append() and add() convenience functions accept variadic
arguments. Replace add(add()...) constructs, as well as clumsy concatenations
of directory names and getDirDelimiter(), with simple variadic add() calls.
---
 indra/test/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'indra/test/CMakeLists.txt')

diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index 3f12431acc..8344cead57 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -73,9 +73,6 @@ if (NOT WINDOWS)
   list(APPEND test_SOURCE_FILES
        llmessagetemplateparser_tut.cpp
        )
-  set(EXTRA_WINDOWS_LIBRARIES "")
-else (NOT WINDOWS)
-  set(EXTRA_WINDOWS_LIBRARIES ole32)
 endif (NOT WINDOWS)
 
 set_source_files_properties(${test_HEADER_FILES}
@@ -99,7 +96,6 @@ target_link_libraries(lltest
     ${GOOGLEMOCK_LIBRARIES}
     ${PTHREAD_LIBRARY}
     ${WINDOWS_LIBRARIES}
-    ${EXTRA_WINDOWS_LIBRARIES}
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
     ${BOOST_COROUTINE_LIBRARY}
-- 
cgit v1.2.3