summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-04-16 17:30:09 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-04-16 17:30:09 +0200
commitbb35d5a59965235fa212299f11138da7b253760e (patch)
tree0ec16f5b6832504a01ed4c7151ff124aebe11b17
parent924fa0fa78b41c7e8486c1ed29764afb1e32fd7e (diff)
Remove some more obsolete includes (UnixInstall) and include_directories()
-rw-r--r--indra/llfilesystem/CMakeLists.txt10
-rw-r--r--indra/llmessage/CMakeLists.txt6
-rw-r--r--indra/newview/CMakeLists.txt7
3 files changed, 0 insertions, 23 deletions
diff --git a/indra/llfilesystem/CMakeLists.txt b/indra/llfilesystem/CMakeLists.txt
index 7274c3b450..882f5b8fba 100644
--- a/indra/llfilesystem/CMakeLists.txt
+++ b/indra/llfilesystem/CMakeLists.txt
@@ -4,12 +4,6 @@ project(llfilesystem)
include(00-Common)
include(LLCommon)
-include(UnixInstall)
-
-include_directories(
- ${LLCOMMON_INCLUDE_DIRS}
- ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
- )
set(llfilesystem_SOURCE_FILES
lldir.cpp
@@ -73,10 +67,6 @@ if (LL_TESTS)
lldiriterator.cpp
)
- set_source_files_properties(lldiriterator.cpp
- PROPERTIES
- LL_TEST_ADDITIONAL_LIBRARIES "${cache_BOOST_LIBRARIES}"
- )
LL_ADD_PROJECT_UNIT_TESTS(llfilesystem "${llfilesystem_TEST_SOURCE_FILES}")
# INTEGRATION TESTS
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 20435d991a..623798176b 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -15,12 +15,6 @@ include(JsonCpp)
include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(
- ${LLCOREHTTP_INCLUDE_DIRS}
- ${LLMESSAGE_INCLUDE_DIRS}
- ${LLFILESYSTEM_INCLUDE_DIRS}
- )
-
set(llmessage_SOURCE_FILES
llassetstorage.cpp
llavatarname.cpp
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 3ec0c2179c..3d1d9e0266 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -40,7 +40,6 @@ include(PNG)
include(TemplateCheck)
include(ThreeJS)
include(UI)
-include(UnixInstall)
include(ViewerMiscLibs)
include(ViewerManager)
include(VisualLeakDetector)
@@ -1370,12 +1369,6 @@ if (DARWIN)
COMPILE_FLAGS "-fmodules -fcxx-modules -Wno-nullability-completeness"
)
- if (USE_BUGSPLAT)
- list(APPEND viewer_LIBRARIES
- bugsplat::bugsplat
- )
- endif (USE_BUGSPLAT)
-
# Add resource files to the project.
set(viewer_RESOURCE_FILES
secondlife.icns