From 1a17e19a610b598650624fb0ae3e67352f00e499 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 8 Jul 2021 20:29:28 +0300
Subject: DRTVWR-542 WIP #2

---
 indra/cmake/CMakeLists.txt      | 1 +
 indra/cmake/MESHOPTIMIZER.cmake | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 7795aa7db1..527a9cba43 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -75,6 +75,7 @@ set(cmake_SOURCE_FILES
     LLXML.cmake
     Linking.cmake
     MediaPluginBase.cmake
+    MESHOPTIMIZER.cmake
     NDOF.cmake
     OPENAL.cmake
     OpenGL.cmake
diff --git a/indra/cmake/MESHOPTIMIZER.cmake b/indra/cmake/MESHOPTIMIZER.cmake
index 7600a56999..6a31dc5569 100644
--- a/indra/cmake/MESHOPTIMIZER.cmake
+++ b/indra/cmake/MESHOPTIMIZER.cmake
@@ -1,16 +1,16 @@
 # -*- cmake -*-
 
+include(Linking)
 include(Prebuilt)
 
 use_prebuilt_binary(meshoptimizer)
 
 if (WINDOWS)
-  set(MESHOPTIMIZER_LIBRARIES
-    debug meshoptimizer
-    optimized meshoptimizer)
+  set(MESHOPTIMIZER_LIBRARIES meshoptimizer.lib)
 elseif (LINUX)
-  set(MESHOPTIMIZER_LIBRARIES meshoptimizer)
+  set(MESHOPTIMIZER_LIBRARIES meshoptimizer.o)
 elseif (DARWIN)
   set(MESHOPTIMIZER_LIBRARIES libmeshoptimizer.o)
 endif (WINDOWS)
+
 set(MESHOPTIMIZER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
-- 
cgit v1.2.3