From 1b6cd23abdc9e5208076d55cce9f06bc2a0713a1 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Wed, 29 Mar 2023 17:05:40 -0700
Subject: CMake and tests fixups after merge with main for DRTVWR-559

---
 indra/newview/CMakeLists.txt                         | 6 +++---
 indra/newview/llgltfmateriallist.cpp                 | 2 --
 indra/newview/tests/llviewercontrollistener_test.cpp | 5 ++---
 indra/newview/tests/llvocache_test.cpp               | 9 +++++----
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 12d452011d..b197182009 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2229,8 +2229,8 @@ if (LL_TESTS)
   set_source_files_properties(
     llvocache.cpp
     PROPERTIES
-    LL_TEST_ADDITIONAL_SOURCE_FILES 
-    ../llmessage/lldatapacker.cpp
+    LL_TEST_ADDITIONAL_SOURCE_FILES ../llmessage/lldatapacker.cpp
+    LL_TEST_ADDITIONAL_PROJECTS "llprimitive"
   )
 
   set(test_libs
@@ -2251,7 +2251,6 @@ if (LL_TESTS)
     LL_TEST_ADDITIONAL_LIBRARIES "${test_libs}"
   )
 
-
   set_source_files_properties(
     llworldmap.cpp
     llworldmipmap.cpp
@@ -2271,6 +2270,7 @@ if (LL_TESTS)
     PROPERTIES
     LL_TEST_ADDITIONAL_SOURCE_FILES llversioninfo.cpp
   )
+
   set_property( SOURCE
           ${viewer_TEST_SOURCE_FILES}
           PROPERTY
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 9c78e48cab..57a67f52f6 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -554,8 +554,6 @@ void LLGLTFMaterialList::onAssetLoadComplete(const LLUUID& id, LLAssetType::ETyp
         LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
         LL::WorkQueue::ptr_t general_queue = LL::WorkQueue::getInstance("General");
 
-        typedef std::pair<U32, tinygltf::Model> return_data_t;
-
         main_queue->postTo(
             general_queue,
             [id, asset_type, asset_data]() // Work done on general queue
diff --git a/indra/newview/tests/llviewercontrollistener_test.cpp b/indra/newview/tests/llviewercontrollistener_test.cpp
index 6d100ef984..8aed2a8043 100644
--- a/indra/newview/tests/llviewercontrollistener_test.cpp
+++ b/indra/newview/tests/llviewercontrollistener_test.cpp
@@ -10,9 +10,9 @@
  */
 
 // Precompiled header
-#include "llviewerprecompiledheaders.h"
+#include "../llviewerprecompiledheaders.h"
 // associated header
-#include "llviewercontrollistener.h"
+#include "../llviewercontrollistener.h"
 // STL headers
 // std headers
 // external library headers
@@ -21,7 +21,6 @@
 #include "../test/catch_and_store_what_in.h" // catch_what()
 #include "commoncontrol.h"
 #include "llcontrol.h"              // LLControlGroup
-#include "llviewercontrollistener.h"
 
 /*****************************************************************************
 *   TUT
diff --git a/indra/newview/tests/llvocache_test.cpp b/indra/newview/tests/llvocache_test.cpp
index ea6abe254e..c27730eb58 100644
--- a/indra/newview/tests/llvocache_test.cpp
+++ b/indra/newview/tests/llvocache_test.cpp
@@ -28,15 +28,16 @@
 #include "../llviewerprecompiledheaders.h"
 #include "../test/lltut.h"
 
-#include "llvocache.h"
+#include "../llvocache.h"
 
 #include "lldir.h"
-#include "llhudobject.h"
+#include "../llhudobject.h"
 #include "llregionhandle.h"
 #include "llsdutil.h"
 #include "llsdserialize.h"
-#include "llviewerobjectlist.h"
-#include "llviewerregion.h"
+
+#include "../llviewerobjectlist.h"
+#include "../llviewerregion.h"
 
 #include "lldir_stub.cpp"
 #include "llvieweroctree_stub.cpp"
-- 
cgit v1.2.3