summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/LLCommon.cmake1
-rw-r--r--indra/cmake/LLMath.cmake1
-rw-r--r--indra/cmake/LLRender.cmake22
-rw-r--r--indra/cmake/Tracy.cmake7
4 files changed, 2 insertions, 29 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index 03f1fe39cb..869d5805f2 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 688e62e24b..e841d2ac78 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 2d9d3725ad..0000000000
--- 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 cf9c866f8e..0bf3bd85ff 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)