From 1b6cd23abdc9e5208076d55cce9f06bc2a0713a1 Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Wed, 29 Mar 2023 17:05:40 -0700 Subject: CMake and tests fixups after merge with main for DRTVWR-559 --- indra/newview/tests/llviewercontrollistener_test.cpp | 5 ++--- indra/newview/tests/llvocache_test.cpp | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/tests') 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