summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/cmake/CMakeLists.txt2
-rw-r--r--indra/cmake/Meshoptimizer.cmake (renamed from indra/cmake/MESHOPTIMIZER.cmake)1
-rw-r--r--indra/llmeshoptimizer/CMakeLists.txt2
-rw-r--r--indra/newview/CMakeLists.txt1
4 files changed, 2 insertions, 4 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index ec143d86c9..f0b35c08f3 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -43,7 +43,7 @@ set(cmake_SOURCE_FILES
LLTestCommand.cmake
LLWindow.cmake
Linking.cmake
- MESHOPTIMIZER.cmake
+ Meshoptimizer.cmake
NDOF.cmake
OPENAL.cmake
OpenGL.cmake
diff --git a/indra/cmake/MESHOPTIMIZER.cmake b/indra/cmake/Meshoptimizer.cmake
index d1d4df067f..fd144d2b97 100644
--- a/indra/cmake/MESHOPTIMIZER.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -11,7 +11,6 @@ use_prebuilt_binary(meshoptimizer)
if (WINDOWS)
target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.lib)
- set(MESHOPTIMIZER_LIBRARIES )
elseif (LINUX)
target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.o)
elseif (DARWIN)
diff --git a/indra/llmeshoptimizer/CMakeLists.txt b/indra/llmeshoptimizer/CMakeLists.txt
index 47cb424feb..dfac44c296 100644
--- a/indra/llmeshoptimizer/CMakeLists.txt
+++ b/indra/llmeshoptimizer/CMakeLists.txt
@@ -2,7 +2,7 @@
project(llmeshoptimizer)
-include(MESHOPTIMIZER)
+include(Meshoptimizer)
include(00-Common)
include(LLCommon)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a2dad1fb17..2ad40faa37 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -27,7 +27,6 @@ include(LLCommon)
include(LLCoreHttp)
include(LLImage)
include(LLKDU)
-include(MESHOPTIMIZER)
include(LLPhysicsExtensions)
include(LLPrimitive)
include(LLWindow)