From f7561713057209fd9aa259351166129d08028252 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Sun, 11 Aug 2024 14:33:58 +0800
Subject: Linux distro & logical cores queries are shared

by moving them to Variables.cmake so they can be reused throughout
all CMake files.
---
 indra/cmake/CEFPlugin.cmake     | 1 -
 indra/cmake/Meshoptimizer.cmake | 4 ----
 indra/cmake/Variables.cmake     | 3 +++
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 655d924160..8dda7db563 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -22,7 +22,6 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
 else (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
 use_prebuilt_binary(dullahan)
   if (LINUX)
-    cmake_host_system_information(RESULT LINUX_DISTRO QUERY DISTRIB_ID)
     if (${LINUX_DISTRO} MATCHES fedora)
       execute_process(
         COMMAND patchelf --remove-rpath bin/release/dullahan_host
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index 15c6435af9..e926d8118c 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -9,10 +9,6 @@ add_library( ll::meshoptimizer INTERFACE IMPORTED )
 if (NOT USESYSTEMLIBS)
 use_system_binary(meshoptimizer)
 else (NOT USESYSTEMLIBS)
-  cmake_host_system_information(RESULT MAKE_JOBS QUERY NUMBER_OF_LOGICAL_CORES)
-  if (LINUX)
-    cmake_host_system_information(RESULT LINUX_DISTRO QUERY DISTRIB_ID)
-  endif (LINUX)
   if (NOT (${LINUX_DISTRO} MATCHES fedora OR DARWIN))
     find_package(meshoptimizer)
     target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index ab8add8af8..59368e1177 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -101,12 +101,15 @@ else (ADDRESS_SIZE EQUAL 32)
   endif()
 endif (ADDRESS_SIZE EQUAL 32)
 
+cmake_host_system_information(RESULT MAKE_JOBS QUERY NUMBER_OF_LOGICAL_CORES)
+
 if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   set(WINDOWS ON BOOL FORCE)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(LINUX ON BOOl FORCE)
+  cmake_host_system_information(RESULT LINUX_DISTRO QUERY DISTRIB_ID)
 
   if (ADDRESS_SIZE EQUAL 32)
     set(DEB_ARCHITECTURE i386)
-- 
cgit v1.2.3