3 files changed, 70 insertions, 1 deletions
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index be1e9008e5..5a53f43d1c 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -61,6 +61,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 7cce190f6a..39fd21c33f 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -13,7 +13,7 @@ elseif (WINDOWS)
   foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE)
     # prefer more recent Python versions to older ones, if multiple versions
     # are installed
-    foreach(pyver 3.13 3.12 3.11 3.10 3.9 3.8 3.7)
+    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()
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()