From c08a61453b21664da3687661512e2ea208f90d98 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@posteo.nl>
Date: Sun, 5 Jun 2022 16:15:55 +0200
Subject: Port new cmake files (Trace/Meshoptimizer) to modern cmake

---
 indra/llmeshoptimizer/CMakeLists.txt | 38 +++++++++++++-----------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

(limited to 'indra/llmeshoptimizer')

diff --git a/indra/llmeshoptimizer/CMakeLists.txt b/indra/llmeshoptimizer/CMakeLists.txt
index 016794cfad..47cb424feb 100644
--- a/indra/llmeshoptimizer/CMakeLists.txt
+++ b/indra/llmeshoptimizer/CMakeLists.txt
@@ -8,37 +8,27 @@ include(00-Common)
 include(LLCommon)
 include(LLMath)
 
-include_directories(
-    ${LLCOMMON_INCLUDE_DIRS}
-    ${LLMATH_INCLUDE_DIRS}
-    ${LLMESHOPTIMIZER_INCLUDE_DIR}
-    ${MESHOPTIMIZER_INCLUDE_DIRS}
-    ${LIBS_PREBUILT_DIR}/include  #access to boost headers, needed for LLError
-    )
-
 set(llmeshoptimizer_SOURCE_FILES
-    llmeshoptimizer.cpp
-    )
+        llmeshoptimizer.cpp
+        )
 
 set(llmeshoptimizer_HEADER_FILES
-    CMakeLists.txt
-
-    llmeshoptimizer.h
-    )
+        CMakeLists.txt
+        llmeshoptimizer.h
+        )
 
 set_source_files_properties(${llmeshoptimizer_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
+        PROPERTIES HEADER_FILE_ONLY TRUE)
 
 list(APPEND llmeshoptimizer_SOURCE_FILES ${llmeshoptimizer_HEADER_FILES})
 
-#if (USE_MESHOPT)
-  add_library (llmeshoptimizer ${llmeshoptimizer_SOURCE_FILES})
+add_library (llmeshoptimizer ${llmeshoptimizer_SOURCE_FILES})
+target_include_directories( llmeshoptimizer INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(llmeshoptimizer
+        llcommon
+        llmath
+        ll::meshoptimizer)
 
-  target_link_libraries(llmeshoptimizer
-    ${LLCOMMON_LIBRARIES}
-    ${LLMATH_LIBRARIES}
-    ${MESHOPTIMIZER_LIBRARIES})
-  
-  # Add tests
+# Add tests
 
-#endif (USE_MESHOPT)
-- 
cgit v1.3


From 554717044f52fa39e9d42f2c5ea032efb479b280 Mon Sep 17 00:00:00 2001
From: Nicky Dasmijn <nicky.dasmijn@posteo.nl>
Date: Fri, 16 Sep 2022 23:24:39 +0200
Subject: Rename MESHOPTIMIZER.cmake to Meshoptimizer.cmake as those caps
 honestly bug me.

---
 indra/cmake/CMakeLists.txt           |  2 +-
 indra/cmake/MESHOPTIMIZER.cmake      | 21 ---------------------
 indra/cmake/Meshoptimizer.cmake      | 20 ++++++++++++++++++++
 indra/llmeshoptimizer/CMakeLists.txt |  2 +-
 indra/newview/CMakeLists.txt         |  1 -
 5 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 indra/cmake/MESHOPTIMIZER.cmake
 create mode 100644 indra/cmake/Meshoptimizer.cmake

(limited to 'indra/llmeshoptimizer')

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
deleted file mode 100644
index d1d4df067f..0000000000
--- a/indra/cmake/MESHOPTIMIZER.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- cmake -*-
-
-include(Linking)
-include(Prebuilt)
-
-include_guard()
-add_library( ll::meshoptimizer INTERFACE IMPORTED )
-
-use_system_binary(meshoptimizer)
-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)
-  target_link_libraries( ll::meshoptimizer INTERFACE libmeshoptimizer.a)
-endif (WINDOWS)
-
-target_include_directories( ll::meshoptimizer SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
new file mode 100644
index 0000000000..fd144d2b97
--- /dev/null
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -0,0 +1,20 @@
+# -*- cmake -*-
+
+include(Linking)
+include(Prebuilt)
+
+include_guard()
+add_library( ll::meshoptimizer INTERFACE IMPORTED )
+
+use_system_binary(meshoptimizer)
+use_prebuilt_binary(meshoptimizer)
+
+if (WINDOWS)
+  target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.lib)
+elseif (LINUX)
+  target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.o)
+elseif (DARWIN)
+  target_link_libraries( ll::meshoptimizer INTERFACE libmeshoptimizer.a)
+endif (WINDOWS)
+
+target_include_directories( ll::meshoptimizer SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/meshoptimizer)
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)
-- 
cgit v1.3