Merge pull request #5659 from secondlife/marchcat/slua-26.1.1

Update SLua PV to 26.1.1

4 files changed, 93 insertions, 71 deletions

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 5967a96f8a..fd3e0eccde 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -19,56 +19,50 @@ set(addrsfx "-x${ADDRESS_SIZE}")
 
 find_library(BOOST_CONTEXT_LIBRARY
     NAMES
+    libboost_context
     libboost_context-mt
     libboost_context-mt${addrsfx}
+    boost_context
     boost_context-mt
     boost_context-mt${addrsfx}
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
 find_library(BOOST_FIBER_LIBRARY
     NAMES
+    libboost_fiber
     libboost_fiber-mt
     libboost_fiber-mt${addrsfx}
+    boost_fiber
     boost_fiber-mt
     boost_fiber-mt${addrsfx}
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
 find_library(BOOST_FILESYSTEM_LIBRARY
     NAMES
+    libboost_filesystem
     libboost_filesystem-mt
     libboost_filesystem-mt${addrsfx}
+    boost_filesystem
     boost_filesystem-mt
     boost_filesystem-mt${addrsfx}
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
 find_library(BOOST_PROGRAMOPTIONS_LIBRARY
     NAMES
+    libboost_program_options
     libboost_program_options-mt
     libboost_program_options-mt${addrsfx}
+    boost_program_options
     boost_program_options-mt
     boost_program_options-mt${addrsfx}
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
-find_library(BOOST_REGEX_LIBRARY
-    NAMES
-    libboost_regex-mt
-    libboost_regex-mt${addrsfx}
-    boost_regex-mt
-    boost_regex-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
-find_library(BOOST_SYSTEM_LIBRARY
-    NAMES
-    libboost_system-mt
-    libboost_system-mt${addrsfx}
-    boost_system-mt
-    boost_system-mt${addrsfx}
-    PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
-
 find_library(BOOST_URL_LIBRARY
     NAMES
+    libboost_url
     libboost_url-mt
     libboost_url-mt${addrsfx}
+    boost_url
     boost_url-mt
     boost_url-mt${addrsfx}
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
@@ -78,8 +72,6 @@ target_link_libraries(ll::boost INTERFACE
     ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_FILESYSTEM_LIBRARY}
     ${BOOST_PROGRAMOPTIONS_LIBRARY}
-    ${BOOST_REGEX_LIBRARY}
-    ${BOOST_SYSTEM_LIBRARY}
     ${BOOST_URL_LIBRARY})
 
 if (LINUX)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 6bbc61feaa..ea55bffb35 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -64,6 +64,7 @@ set(cmake_SOURCE_FILES
         UI.cmake
         UnixInstall.cmake
         Variables.cmake
+        Velopack.cmake
         VHACD.cmake
         ViewerMiscLibs.cmake
         VisualLeakDetector.cmake
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index 39fd21c33f..428f9e3326 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -1,57 +1,18 @@
-# -*- cmake -*-
+# Allow explicit Python path via environment variable
+if(DEFINED ENV{PYTHON})
+    set(Python3_ROOT_DIR "$ENV{PYTHON}")
+endif()
 
-set(PYTHONINTERP_FOUND)
+# On Windows, prefer registry entries to avoid Cygwin/MSYS Python
+# The registry is searched first by default, which finds native Windows Python
+# installations rather than Cygwin/MSYS Python
+if(WINDOWS)
+    set(Python3_FIND_REGISTRY FIRST CACHE STRING "Python search order")
+endif()
 
-if (DEFINED ENV{PYTHON})
-  # Allow python executable to be explicitly set
-  set(python "$ENV{PYTHON}")
-  set(PYTHONINTERP_FOUND ON)
-elseif (WINDOWS)
-  # On Windows, explicitly avoid Cygwin Python.
+# Find Python 3 interpreter
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
-  # if the user has their own version of Python installed, prefer that
-  foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE)
-    # prefer more recent Python versions to older ones, if multiple versions
-    # are installed
-    foreach(pyver 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7)
-      list(APPEND regpaths "[${hive}\\SOFTWARE\\Python\\PythonCore\\${pyver}\\InstallPath]")
-    endforeach()
-  endforeach()
-
-  # TODO: This logic has the disadvantage that if you have multiple versions
-  # of Python installed, the selected path won't necessarily be the newest -
-  # e.g. this GLOB will prefer Python310 to Python311. But since pymaybe is
-  # checked AFTER the registry entries, this will only surface as a problem if
-  # no installed Python appears in the registry.
-  file(GLOB pymaybe
-    "$ENV{PROGRAMFILES}/Python*"
-##  "$ENV{PROGRAMFILES(X86)}/Python*"
-    # The Windows environment variable is in fact as shown above, but CMake
-    # disallows querying an environment variable containing parentheses -
-    # thanks, Windows. Fudge by just appending " (x86)" to $PROGRAMFILES and
-    # hoping for the best.
-    "$ENV{PROGRAMFILES} (x86)/Python*"
-    "c:/Python*")
-
-  find_program(python
-    NAMES python3.exe python.exe
-    NO_DEFAULT_PATH # added so that cmake does not find cygwin python
-    PATHS
-    ${regpaths}
-    ${pymaybe}
-    )
-  find_package(Python3 COMPONENTS Interpreter)
-else()
-  find_program(python python3)
-
-  if (python)
-    set(PYTHONINTERP_FOUND ON)
-  endif (python)
-endif (DEFINED ENV{PYTHON})
-
-if (NOT python)
-  message(FATAL_ERROR "No Python interpreter found")
-endif (NOT python)
-
-set(PYTHON_EXECUTABLE "${python}" CACHE FILEPATH "Python interpreter for builds")
+# Set legacy variable name for compatibility with existing code
+set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}" CACHE FILEPATH "Python interpreter for builds")
 mark_as_advanced(PYTHON_EXECUTABLE)
diff --git a/indra/cmake/Velopack.cmake b/indra/cmake/Velopack.cmake
new file mode 100644
index 0000000000..a1dbe2cbe9
--- /dev/null
+++ b/indra/cmake/Velopack.cmake
@@ -0,0 +1,68 @@
+# -*- cmake -*-
+# Velopack installer and update framework integration
+# https://velopack.io/
+
+include_guard()
+
+# USE_VELOPACK controls whether to use Velopack for installer packaging (instead of NSIS/DMG)
+option(USE_VELOPACK "Use Velopack for installer packaging" OFF)
+
+if (WINDOWS)
+    include(Prebuilt)
+    use_prebuilt_binary(velopack)
+
+    add_library(ll::velopack INTERFACE IMPORTED)
+
+    target_include_directories(ll::velopack SYSTEM INTERFACE
+        ${LIBS_PREBUILT_DIR}/include/velopack
+    )
+
+    target_link_libraries(ll::velopack INTERFACE
+        ${ARCH_PREBUILT_DIRS_RELEASE}/velopack_libc.lib
+    )
+
+    # Windows system libraries required by Velopack
+    target_link_libraries(ll::velopack INTERFACE
+        winhttp
+        ole32
+        shell32
+        shlwapi
+        version
+        userenv
+        ws2_32
+        bcrypt
+        ntdll
+    )
+
+    target_compile_definitions(ll::velopack INTERFACE LL_VELOPACK=1)
+
+elseif (DARWIN)
+    include(Prebuilt)
+    use_prebuilt_binary(velopack)
+
+    add_library(ll::velopack INTERFACE IMPORTED)
+
+    target_include_directories(ll::velopack SYSTEM INTERFACE
+        ${LIBS_PREBUILT_DIR}/include/velopack
+    )
+
+    target_link_libraries(ll::velopack INTERFACE
+        ${ARCH_PREBUILT_DIRS_RELEASE}/libvelopack_libc.a
+    )
+
+    # macOS system frameworks required by Velopack (Rust static library dependencies)
+    target_link_libraries(ll::velopack INTERFACE
+        "-framework Foundation"
+        "-framework Security"
+        "-framework SystemConfiguration"
+        "-framework AppKit"
+        "-framework CoreFoundation"
+        "-framework CoreServices"
+        "-framework IOKit"
+        "-liconv"
+        "-lresolv"
+    )
+
+    target_compile_definitions(ll::velopack INTERFACE LL_VELOPACK=1)
+
+endif()