summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2023-03-29 17:05:40 -0700
committerBrad Linden <brad@lindenlab.com>2023-03-30 13:46:00 -0700
commit1b6cd23abdc9e5208076d55cce9f06bc2a0713a1 (patch)
tree43cbe646c0b3a03eba30147227ce7762ac89da08 /indra/newview/CMakeLists.txt
parenta548c169899734b7d6af1a1870dab1ad1eb74e3c (diff)
CMake and tests fixups after merge with main for DRTVWR-559
Diffstat (limited to 'indra/newview/CMakeLists.txt')
-rw-r--r--indra/newview/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
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