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: [PATCH] CMake and tests fixups after merge with main for DRTVWR-559
---
indra/cmake/LLCommon.cmake | 1 -
indra/cmake/LLMath.cmake | 1 -
indra/cmake/LLRender.cmake | 22 -------------------
indra/cmake/Tracy.cmake | 7 ++----
indra/llprimitive/CMakeLists.txt | 7 +++---
indra/newview/CMakeLists.txt | 6 ++---
indra/newview/llgltfmateriallist.cpp | 2 --
.../tests/llviewercontrollistener_test.cpp | 5 ++---
indra/newview/tests/llvocache_test.cpp | 9 ++++----
9 files changed, 15 insertions(+), 45 deletions(-)
delete mode 100644 indra/cmake/LLRender.cmake
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index 03f1fe39cb1..869d5805f26 100644
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -9,4 +9,3 @@ include(ZLIBNG)
include(JsonCpp)
include(XmlRpcEpi)
- ${TRACY_LIBRARY}
diff --git a/indra/cmake/LLMath.cmake b/indra/cmake/LLMath.cmake
index 688e62e24ba..e841d2ac78e 100644
--- a/indra/cmake/LLMath.cmake
+++ b/indra/cmake/LLMath.cmake
@@ -2,5 +2,4 @@
include(Variables)
include(Mikktspace)
-include(MESHOPTIMIZER)
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
deleted file mode 100644
index 2d9d3725ad2..00000000000
--- a/indra/cmake/LLRender.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- cmake -*-
-
-include(Variables)
-include(FreeType)
-include(GLH)
-include(GLEXT)
-
-set(LLRENDER_INCLUDE_DIRS
- ${LIBS_OPEN_DIR}/llrender
- ${GLH_INCLUDE_DIR}
- ${GLEXT_INCLUDE_DIR}
- )
-
-if (BUILD_HEADLESS)
- set(LLRENDER_HEADLESS_LIBRARIES
- llrenderheadless
- )
-endif (BUILD_HEADLESS)
-set(LLRENDER_LIBRARIES
- llrender
- )
-
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index cf9c866f8ef..0bf3bd85ff1 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -11,11 +11,8 @@ if (USE_TRACY)
use_prebuilt_binary(tracy)
target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)
- set(TRACY_LIBRARY "TracyClient")
- set(TRACY_LIBRARY "TracyClient")
-# See: indra/llcommon/llprofiler.h
- target_compile_definitions(ll::tracy INTERFACE LL_PROFILER_CONFIGURATION=3 )
- set(TRACY_LIBRARY "TracyClient")
+ # See: indra/llcommon/llprofiler.h
+ add_compile_definitions(LL_PROFILER_CONFIGURATION=3)
endif (USE_TRACY)
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index f8f55759aea..76d261ab3e4 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -7,11 +7,8 @@ include(LLCommon)
include(LLCoreHttp)
include(LLPhysicsExtensions)
include(LLPrimitive)
-include(LLRender)
include(GLH)
include(TinyGLTF)
- ${LLRENDER_INCLUDE_DIRS}
- ${TINYGLTF_INCLUDE_DIR}
set(llprimitive_SOURCE_FILES
lldaeloader.cpp
@@ -68,6 +65,7 @@ target_link_libraries(llprimitive
llcorehttp
llxml
llcharacter
+ llrender
llphysicsextensions_impl
ll::colladadom
ll::pcre
@@ -82,6 +80,7 @@ if (LL_TESTS)
llprimitive.cpp
llgltfmaterial.cpp
)
-
+
+ set_property(SOURCE llprimitive.cpp PROPERTY LL_TEST_ADDITIONAL_LIBRARIES llmessage)
LL_ADD_PROJECT_UNIT_TESTS(llprimitive "${llprimitive_TEST_SOURCE_FILES}")
endif (LL_TESTS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 12d452011d1..b1971820092 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 9c78e48cab6..57a67f52f62 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 6d100ef984b..8aed2a80431 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 ea6abe254ee..c27730eb584 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"
--
GitLab