From 241919e7f7986c11586a49bff53cf19c2c0e0ea6 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 13 Apr 2022 19:21:55 +0200
Subject: Rework cmake, the original plan was to maybe be able to use conan
 targets with the same name (that's why 3ps had names like apr::apr), but it's
 safer and saner to put the LL 3ps under the ll:: prefix. This also allows
 means it is possible to get rid of that bad "if( TRAGET ...) return()
 endif()" pattern and rather use include_guard().

---
 indra/linux_crash_logger/CMakeLists.txt | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'indra/linux_crash_logger')

diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index aa82ed12cc..daa78f77ff 100644
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -61,18 +61,15 @@ set(LIBRT_LIBRARY rt)
 
 
 target_link_libraries(linux-crash-logger
-    ${LLCRASHLOGGER_LIBRARIES}
-    ${LLFILESYSTEM_LIBRARIES}
-    ${LLXML_LIBRARIES}
-    ${LLMESSAGE_LIBRARIES}
-    ${LLMATH_LIBRARIES}
-    ${LLCOREHTTP_LIBRARIES}
-    ${LLCOMMON_LIBRARIES}
-    ${BOOST_FIBER_LIBRARY}
-    ${BOOST_CONTEXT_LIBRARY}
+        llcrashlogger
+        llfilesystem
+        llxml
+        llmessage
+        llmath
+        llcorehttp
+        llcommon
     ${UI_LIBRARIES}
-    ${DB_LIBRARIES}
-    ${FREETYPE_LIBRARIES}
+    ll::freetype
     ${LIBRT_LIBRARY}
     )
 
-- 
cgit v1.2.3


From 924fa0fa78b41c7e8486c1ed29764afb1e32fd7e Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 16 Apr 2022 17:28:26 +0200
Subject: create target ll::uilibraries to have one common target that defines
 what each operation system needs as dependencies on OS gui libraries.

---
 indra/linux_crash_logger/CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'indra/linux_crash_logger')

diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index daa78f77ff..594cb34ce4 100644
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -68,9 +68,7 @@ target_link_libraries(linux-crash-logger
         llmath
         llcorehttp
         llcommon
-    ${UI_LIBRARIES}
-    ll::freetype
-    ${LIBRT_LIBRARY}
+        ll::uilibraries
     )
 
 add_custom_target(linux-crash-logger-target ALL
-- 
cgit v1.2.3


From 283c2a20cc4ef856076d287303c7143332b201fe Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sun, 1 May 2022 00:38:40 +0200
Subject: Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
 sets the property on those.

---
 indra/linux_crash_logger/CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/linux_crash_logger')

diff --git a/indra/linux_crash_logger/CMakeLists.txt b/indra/linux_crash_logger/CMakeLists.txt
index 594cb34ce4..1793aa82b9 100644
--- a/indra/linux_crash_logger/CMakeLists.txt
+++ b/indra/linux_crash_logger/CMakeLists.txt
@@ -45,9 +45,6 @@ set(linux_crash_logger_HEADER_FILES
     llcrashloggerlinux.h
     )
 
-set_source_files_properties(${linux_crash_logger_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
 list(APPEND linux_crash_logger_SOURCE_FILES
      ${linux_crash_logger_HEADER_FILES}
      )
-- 
cgit v1.2.3