5 files changed, 17 insertions, 30 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index e592418a18..ec143d86c9 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -37,7 +37,6 @@ set(cmake_SOURCE_FILES
         LLCommon.cmake
         LLImage.cmake
         LLKDU.cmake
-        LLMeshOptimizer.cmake
         LLPhysicsExtensions.cmake
         LLPrimitive.cmake
         LLSharedLibs.cmake
diff --git a/indra/cmake/LLMeshOptimizer.cmake b/indra/cmake/LLMeshOptimizer.cmake
deleted file mode 100644
index b79944f618..0000000000
--- a/indra/cmake/LLMeshOptimizer.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-set(LLMESHOPTIMIZER_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llmeshoptimizer
-    )
-
-set(LLMESHOPTIMIZER_LIBRARIES llmeshoptimizer)
diff --git a/indra/cmake/MESHOPTIMIZER.cmake b/indra/cmake/MESHOPTIMIZER.cmake
index 1c5b47b9bd..0d51f47866 100644
--- a/indra/cmake/MESHOPTIMIZER.cmake
+++ b/indra/cmake/MESHOPTIMIZER.cmake
@@ -3,14 +3,19 @@
 include(Linking)
 include(Prebuilt)
 
+include_guard()
+add_library( ll::meshoptimizer INTERFACE IMPORTED )
+
+use_conan_binary(meshoptimizer)
 use_prebuilt_binary(meshoptimizer)
 
 if (WINDOWS)
-  set(MESHOPTIMIZER_LIBRARIES meshoptimizer.lib)
+  target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.lib)
+  set(MESHOPTIMIZER_LIBRARIES )
 elseif (LINUX)
-  set(MESHOPTIMIZER_LIBRARIES meshoptimizer.o)
+  target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.o)
 elseif (DARWIN)
-  set(MESHOPTIMIZER_LIBRARIES libmeshoptimizer.a)
+  target_link_libraries( ll::meshoptimizer INTERFACE libmeshoptimizer.a)
 endif (WINDOWS)
 
-set(MESHOPTIMIZER_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
+target_include_directories( ll::meshoptimizer SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index cfff956bcf..c7563f1b7e 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -1,29 +1,18 @@
 # -*- cmake -*-
 include(Prebuilt)
 
+include_guard()
+add_library( ll::tracy INTERFACE IMPORTED )
+
 set(USE_TRACY OFF CACHE BOOL "Use Tracy profiler.")
 
 if (USE_TRACY)
-  set(TRACY_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/tracy) 
-
-# See: indra/llcommon/llprofiler.h
-  add_definitions(-DLL_PROFILER_CONFIGURATION=3)
+  use_conan_binary(tracy)
   use_prebuilt_binary(tracy)
 
-  if (WINDOWS)
-    MESSAGE(STATUS "Including Tracy for Windows: '${TRACY_INCLUDE_DIR}'")
-  endif (WINDOWS)
+  target_include_directories( ll::tracy SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/tracy)
 
-  if (DARWIN)
-    MESSAGE(STATUS "Including Tracy for Darwin: '${TRACY_INCLUDE_DIR}'")
-  endif (DARWIN)
-
-  if (LINUX)
-    MESSAGE(STATUS "Including Tracy for Linux: '${TRACY_INCLUDE_DIR}'")
-  endif (LINUX)
-else (USE_TRACY)
-  # Tracy.cmake should not set LLCOMMON_INCLUDE_DIRS, let LLCommon.cmake do that
-  set(TRACY_INCLUDE_DIR "")
-  set(TRACY_LIBRARY "")
+# See: indra/llcommon/llprofiler.h
+  target_compile_definitions(ll::tracy INTERFACE LL_PROFILER_CONFIGURATION=3 )
 endif (USE_TRACY)
 
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 8529576fda..c02ad3e161 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -44,6 +44,7 @@ if( WINDOWS )
           Vfw32
           wer
           winspool
+          imm32
           )
 endif()