From d3521b4462195cfe882b2cc8eb4e7c5e948c0fb6 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Wed, 13 Apr 2022 10:28:46 +0200
Subject: Remove obsolete and unmaintained USE_SYSTEMLIBS

---
 indra/cmake/UI.cmake | 87 +++++++++++++++++-----------------------------------
 1 file changed, 28 insertions(+), 59 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 77fd505df3..c12dca2ab9 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -2,67 +2,36 @@
 include(Prebuilt)
 include(FreeType)
 
-if (USESYSTEMLIBS)
-  include(FindPkgConfig)
-    
-  if (LINUX)
-    set(PKGCONFIG_PACKAGES
-        atk
-        cairo
-        gdk-2.0
-        gdk-pixbuf-2.0
-        glib-2.0
-        gmodule-2.0
-        gtk+-2.0
-        gthread-2.0
-        libpng
-        pango
-        pangoft2
-        pangox
-        pangoxft
-        sdl
-        )
-  endif (LINUX)
-
-  foreach(pkg ${PKGCONFIG_PACKAGES})
-    pkg_check_modules(${pkg} REQUIRED ${pkg})
-    include_directories(${${pkg}_INCLUDE_DIRS})
-    link_directories(${${pkg}_LIBRARY_DIRS})
-    list(APPEND UI_LIBRARIES ${${pkg}_LIBRARIES})
-    add_definitions(${${pkg}_CFLAGS_OTHERS})
-  endforeach(pkg)
-else (USESYSTEMLIBS)
-  if (LINUX)
-    use_prebuilt_binary(gtk-atk-pango-glib)
-  endif (LINUX)
+if (LINUX)
+  use_prebuilt_binary(gtk-atk-pango-glib)
+endif (LINUX)
 
-  if (LINUX)
-    set(UI_LIBRARIES
-        atk-1.0
-        gdk-x11-2.0
-        gdk_pixbuf-2.0
-        Xinerama
-        glib-2.0
-        gmodule-2.0
-        gobject-2.0
-        gthread-2.0
-        gtk-x11-2.0
-        pango-1.0
-        pangoft2-1.0
-        pangox-1.0
-        pangoxft-1.0
-        ${FREETYPE_LIBRARIES}
-        )
-  endif (LINUX)
+if (LINUX)
+  set(UI_LIBRARIES
+          atk-1.0
+          gdk-x11-2.0
+          gdk_pixbuf-2.0
+          Xinerama
+          glib-2.0
+          gmodule-2.0
+          gobject-2.0
+          gthread-2.0
+          gtk-x11-2.0
+          pango-1.0
+          pangoft2-1.0
+          pangox-1.0
+          pangoxft-1.0
+          ${FREETYPE_LIBRARIES}
+          )
+endif (LINUX)
 
-  include_directories (
-      ${LIBS_PREBUILT_DIR}/include
-      ${LIBS_PREBUILT_DIR}/include
-      )
-  foreach(include ${${LL_ARCH}_INCLUDES})
-      include_directories(${LIBS_PREBUILT_DIR}/include/${include})
-  endforeach(include)
-endif (USESYSTEMLIBS)
+include_directories (
+        ${LIBS_PREBUILT_DIR}/include
+        ${LIBS_PREBUILT_DIR}/include
+)
+foreach(include ${${LL_ARCH}_INCLUDES})
+  include_directories(${LIBS_PREBUILT_DIR}/include/${include})
+endforeach(include)
 
 if (LINUX)
   add_definitions(-DLL_GTK=1 -DLL_X11=1)
-- 
cgit v1.2.3


From 3eec716b240167cda6a5c652584152af8756b56d Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 16 Apr 2022 17:17:32 +0200
Subject: Do not use ${ARCH}_linux_INCLUDES atm

---
 indra/cmake/UI.cmake | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index c12dca2ab9..ee95547136 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -28,10 +28,27 @@ endif (LINUX)
 include_directories (
         ${LIBS_PREBUILT_DIR}/include
         ${LIBS_PREBUILT_DIR}/include
-)
-foreach(include ${${LL_ARCH}_INCLUDES})
-  include_directories(${LIBS_PREBUILT_DIR}/include/${include})
-endforeach(include)
+        )
+
+
+# The following made no real sense
+# - ${ARCH}_linux_INCLUDES was set in 00-Common.cmake,
+# - Here ist is used, but as ${${LL_ARCH}_INCLUDES}
+# It would make more sense to use one form ($LL_ARCH)
+# Leave this out for the moment, but come back when looking at the Linux build
+
+#set(${ARCH}_linux_INCLUDES
+#        atk-1.0
+#        glib-2.0
+#        gstreamer-0.10
+#        gtk-2.0
+#        pango-1.0
+#        )
+#foreach(include ${${LL_ARCH}_INCLUDES})
+#  set_target_include_dirs( ll::uilibraries
+#          ${LIBS_PREBUILT_DIR}/include/${include}
+#          )
+#endforeach(include)
 
 if (LINUX)
   add_definitions(-DLL_GTK=1 -DLL_X11=1)
-- 
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/cmake/UI.cmake | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index ee95547136..03eb1b3fc4 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -6,8 +6,10 @@ if (LINUX)
   use_prebuilt_binary(gtk-atk-pango-glib)
 endif (LINUX)
 
+create_target( ll::uilibraries )
+
 if (LINUX)
-  set(UI_LIBRARIES
+  set_target_libraries( ll::uilibraries
           atk-1.0
           gdk-x11-2.0
           gdk_pixbuf-2.0
@@ -21,12 +23,27 @@ if (LINUX)
           pangoft2-1.0
           pangox-1.0
           pangoxft-1.0
-          ${FREETYPE_LIBRARIES}
+          Xinerama
+          ll::freetype
           )
 endif (LINUX)
+if( WINDOWS )
+  set_target_libraries( ll::uilibraries
+          opengl32
+          comdlg32
+          dxguid
+          kernel32
+          odbc32
+          odbccp32
+          oleaut32
+          shell32
+          Vfw32
+          wer
+          winspool
+          )
+endif()
 
-include_directories (
-        ${LIBS_PREBUILT_DIR}/include
+set_target_include_dirs( ll::uilibraries
         ${LIBS_PREBUILT_DIR}/include
         )
 
@@ -51,5 +68,5 @@ include_directories (
 #endforeach(include)
 
 if (LINUX)
-  add_definitions(-DLL_GTK=1 -DLL_X11=1)
+  set_target_properties(ll::uilibraries PROPERTIES COMPILE_DEFINITIONS LL_GTK=1 LL_X11=1 )
 endif (LINUX)
-- 
cgit v1.2.3


From 6d0bba9c03da0d8aca5e88fcb9289cb2f89f3467 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sun, 17 Apr 2022 17:32:14 +0200
Subject: Switch over to standard target_link_libraries (cmake requirements are
 high enough now).

---
 indra/cmake/UI.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 03eb1b3fc4..57b33ce34b 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -9,7 +9,7 @@ endif (LINUX)
 create_target( ll::uilibraries )
 
 if (LINUX)
-  set_target_libraries( ll::uilibraries
+  target_link_libraries( ll::uilibraries INTERFACE
           atk-1.0
           gdk-x11-2.0
           gdk_pixbuf-2.0
@@ -28,7 +28,7 @@ if (LINUX)
           )
 endif (LINUX)
 if( WINDOWS )
-  set_target_libraries( ll::uilibraries
+  target_link_libraries( ll::uilibraries INTERFACE
           opengl32
           comdlg32
           dxguid
-- 
cgit v1.2.3


From e0cf0cdfd49e5a946dcd202a083fb23f01e4f1fe Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sun, 17 Apr 2022 18:04:57 +0200
Subject: Switch to target_include_directories All 3Ps include dirs are treated
 as SYSTEM, this will stop compilers stop emitting warnings from those files
 and greatly helps having high warning levels and not being swamped by
 warnings that come from external libraries.

---
 indra/cmake/UI.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 57b33ce34b..c23fb6e8a7 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -43,7 +43,7 @@ if( WINDOWS )
           )
 endif()
 
-set_target_include_dirs( ll::uilibraries
+target_include_directories( ll::uilibraries SYSTEM INTERFACE
         ${LIBS_PREBUILT_DIR}/include
         )
 
@@ -62,7 +62,7 @@ set_target_include_dirs( ll::uilibraries
 #        pango-1.0
 #        )
 #foreach(include ${${LL_ARCH}_INCLUDES})
-#  set_target_include_dirs( ll::uilibraries
+#  target_include_directories( ll::uilibraries SYSTEM INTERFACE
 #          ${LIBS_PREBUILT_DIR}/include/${include}
 #          )
 #endforeach(include)
-- 
cgit v1.2.3


From 363f2df4fa22b3eb95ff4603d73b7a042f3fefd1 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sun, 17 Apr 2022 18:28:55 +0200
Subject: Remove function create_target and instead directly use add_library

---
 indra/cmake/UI.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index c23fb6e8a7..6a2e6f22df 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -6,7 +6,7 @@ if (LINUX)
   use_prebuilt_binary(gtk-atk-pango-glib)
 endif (LINUX)
 
-create_target( ll::uilibraries )
+add_library( ll::uilibraries INTERFACE IMPORTED )
 
 if (LINUX)
   target_link_libraries( ll::uilibraries INTERFACE
@@ -68,5 +68,5 @@ target_include_directories( ll::uilibraries SYSTEM INTERFACE
 #endforeach(include)
 
 if (LINUX)
-  set_target_properties(ll::uilibraries PROPERTIES COMPILE_DEFINITIONS LL_GTK=1 LL_X11=1 )
+  target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 )
 endif (LINUX)
-- 
cgit v1.2.3


From 2b151e0aefd54671e1be504269f10318d303dccb Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Mon, 18 Apr 2022 18:11:43 +0200
Subject: Round one to support conan for 3P packages, this allows to build the
 viewer on Linux again.

---
 indra/cmake/UI.cmake | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 6a2e6f22df..066975a3d0 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -2,13 +2,17 @@
 include(Prebuilt)
 include(FreeType)
 
-if (LINUX)
-  use_prebuilt_binary(gtk-atk-pango-glib)
-endif (LINUX)
-
 add_library( ll::uilibraries INTERFACE IMPORTED )
 
 if (LINUX)
+  target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 )
+
+  if( USE_CONAN )
+	target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk )
+	return()
+  endif()
+  use_prebuilt_binary(gtk-atk-pango-glib)
+  
   target_link_libraries( ll::uilibraries INTERFACE
           atk-1.0
           gdk-x11-2.0
@@ -67,6 +71,3 @@ target_include_directories( ll::uilibraries SYSTEM INTERFACE
 #          )
 #endforeach(include)
 
-if (LINUX)
-  target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 )
-endif (LINUX)
-- 
cgit v1.2.3


From 42820f834fcd68c40dc71f1be2a2b7d50096f148 Mon Sep 17 00:00:00 2001
From: Nicky <nicky.dasmijn@gmail.com>
Date: Sat, 7 May 2022 17:29:16 +0200
Subject: Remove unused LL_ARCH/LL_ARCH_DIR

---
 indra/cmake/UI.cmake | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 066975a3d0..8529576fda 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -51,23 +51,3 @@ target_include_directories( ll::uilibraries SYSTEM INTERFACE
         ${LIBS_PREBUILT_DIR}/include
         )
 
-
-# The following made no real sense
-# - ${ARCH}_linux_INCLUDES was set in 00-Common.cmake,
-# - Here ist is used, but as ${${LL_ARCH}_INCLUDES}
-# It would make more sense to use one form ($LL_ARCH)
-# Leave this out for the moment, but come back when looking at the Linux build
-
-#set(${ARCH}_linux_INCLUDES
-#        atk-1.0
-#        glib-2.0
-#        gstreamer-0.10
-#        gtk-2.0
-#        pango-1.0
-#        )
-#foreach(include ${${LL_ARCH}_INCLUDES})
-#  target_include_directories( ll::uilibraries SYSTEM INTERFACE
-#          ${LIBS_PREBUILT_DIR}/include/${include}
-#          )
-#endforeach(include)
-
-- 
cgit v1.2.3


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/cmake/UI.cmake | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/cmake/UI.cmake')

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()
 
-- 
cgit v1.2.3


From c7366f4c55c6442414eb6c5a6736baf90f1a4700 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 17 Sep 2022 02:09:04 +0300
Subject: SL-17238 Fix coding policy build issues

---
 indra/cmake/UI.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake/UI.cmake')

diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index c02ad3e161..8b70192efc 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -8,8 +8,8 @@ if (LINUX)
   target_compile_definitions(ll::uilibraries INTERFACE LL_GTK=1 LL_X11=1 )
 
   if( USE_CONAN )
-	target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk )
-	return()
+    target_link_libraries( ll::uilibraries INTERFACE CONAN_PKG::gtk )
+    return()
   endif()
   use_prebuilt_binary(gtk-atk-pango-glib)
   
-- 
cgit v1.2.3