From 199d71b2baa76f1719cd074b60051db40886f7c0 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Mon, 12 Aug 2024 15:22:41 +0800
Subject: Download & install aren't redone when installed

by making sure we *write* the _installed files (containing the value 0).
---
 indra/cmake/CEFPlugin.cmake     | 2 ++
 indra/cmake/FMODSTUDIO.cmake    | 1 +
 indra/cmake/Meshoptimizer.cmake | 1 +
 indra/cmake/OpenJPEG.cmake      | 1 +
 4 files changed, 5 insertions(+)

(limited to 'indra')

diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 921a6e8032..3cf753e69d 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -18,6 +18,7 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
             WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
             RESULT_VARIABLE dullahan_installed
             )
+        file(WRITE ${PREBUILD_TRACKING_DIR}/dullahan_installed "${dullahan_installed}")
     endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/dullahan_installed OR NOT ${dullahan_installed} EQUAL 0)
 elseif (CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
     if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/dullahan_installed OR NOT ${dullahan_installed} EQUAL 0)
@@ -32,6 +33,7 @@ elseif (CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
             WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
             RESULT_VARIABLE dullahan_installed
             )
+        file(WRITE ${PREBUILD_TRACKING_DIR}/dullahan_installed "${dullahan_installed}")
     endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/dullahan_installed OR NOT ${dullahan_installed} EQUAL 0)
 else (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
 use_prebuilt_binary(dullahan)
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 39636d7522..c5839f6174 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -86,6 +86,7 @@ if (USE_FMODSTUDIO)
           RESULT_VARIABLE ${_binary}_installed
           )
       endif (DARWIN)
+      file(WRITE ${PREBUILD_TRACKING_DIR}/fmodstudio_installed "${fmodstudio_installed}")
     else (USESYSTEMLIBS)
     use_prebuilt_binary(fmodstudio)
     endif (USESYSTEMLIBS)
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index e926d8118c..7eb1d3cf77 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -54,6 +54,7 @@ if (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR NOT USESYSTEMLIBS)
         WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
         RESULT_VARIABLE meshoptimizer_installed
         )
+      file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
     endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed OR NOT ${meshoptimizer_installed} EQUAL 0)
   else (USESYSTEMLIBS)
 use_prebuilt_binary(meshoptimizer)
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 778cf62e29..16603ac9e5 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -41,6 +41,7 @@ if (USESYSTEMLIBS AND (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR CMAKE_SYSTEM_
       WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
       RESULT_VARIABLE openjpeg_installed
       )
+    file(WRITE ${PREBUILD_TRACKING_DIR}/openjpeg_installed "${openjpeg_installed}")
   endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/openjpeg_installed OR NOT ${openjpeg_installed} EQUAL 0)
 else (USESYSTEMLIBS AND (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR CMAKE_SYSTEM_NAME MATCHES FreeBSD))
 use_prebuilt_binary(openjpeg)
-- 
cgit v1.2.3