Right WORKING_DIRECTORY values to shorten paths

5 files changed, 50 insertions, 57 deletions

diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 24d76b03e7..886d77e040 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -7,14 +7,12 @@ add_library( ll::cef INTERFACE IMPORTED )
 
 if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
     if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/dullahan_installed OR NOT ${dullahan_installed} EQUAL 0)
-        execute_process(COMMAND curl
-            -O
-            https://megapahit.net/downloads/dullahan-1.14.0.202312131437_118.7.1_g99817d2_chromium-118.0.5993.119-darwin64-242070244.tar.bz2
+        execute_process(
+            COMMAND curl -O https://megapahit.net/downloads/dullahan-1.14.0.202312131437_118.7.1_g99817d2_chromium-118.0.5993.119-darwin64-242070244.tar.bz2
             WORKING_DIRECTORY $ENV{HOME}/Downloads
             )
-        execute_process(COMMAND tar
-            xf
-            $ENV{HOME}/Downloads/dullahan-1.14.0.202312131437_118.7.1_g99817d2_chromium-118.0.5993.119-darwin64-242070244.tar.bz2
+        execute_process(
+            COMMAND tar xf $ENV{HOME}/Downloads/dullahan-1.14.0.202312131437_118.7.1_g99817d2_chromium-118.0.5993.119-darwin64-242070244.tar.bz2
             WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
             RESULT_VARIABLE dullahan_installed
             )
@@ -22,14 +20,12 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
     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)
-        execute_process(COMMAND curl
-            -O
-            https://megapahit.net/downloads/dullahan-1.14.0.202312131437_118.7.1_g99817d2_chromium-118.0.5993.119-darwin64-242070158.tar.bz2
+        execute_process(
+            COMMAND curl -O https://megapahit.net/downloads/dullahan-1.14.0.202312131437_118.7.1_g99817d2_chromium-118.0.5993.119-darwin64-242070158.tar.bz2
             WORKING_DIRECTORY $ENV{HOME}/Downloads
             )
-        execute_process(COMMAND tar
-            xf
-            $ENV{HOME}/Downloads/dullahan-1.14.0.202312131437_118.7.1_g99817d2_chromium-118.0.5993.119-darwin64-242070158.tar.bz2
+        execute_process(
+            COMMAND tar xf $ENV{HOME}/Downloads/dullahan-1.14.0.202312131437_118.7.1_g99817d2_chromium-118.0.5993.119-darwin64-242070158.tar.bz2
             WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
             RESULT_VARIABLE dullahan_installed
             )
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 9f82cf3db8..5b99a01413 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -35,50 +35,53 @@ if (USE_FMODSTUDIO)
         execute_process(
           COMMAND hdiutil attach -noverify $ENV{HOME}/Downloads/fmodstudioapi20223mac-installer.dmg
           COMMAND mkdir -p
-            ${AUTOBUILD_INSTALL_DIR}/include/fmodstudio
-            ${AUTOBUILD_INSTALL_DIR}/lib/release
+            include/fmodstudio
+            lib/release
+          WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
           )
         execute_process(
           COMMAND cp
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/inc/fmod.h
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/inc/fmod.hpp
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/inc/fmod_codec.h
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/inc/fmod_common.h
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/inc/fmod_dsp.h
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/inc/fmod_dsp_effects.h
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/inc/fmod_errors.h
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/inc/fmod_output.h
+            inc/fmod.h
+            inc/fmod.hpp
+            inc/fmod_codec.h
+            inc/fmod_common.h
+            inc/fmod_dsp.h
+            inc/fmod_dsp_effects.h
+            inc/fmod_errors.h
+            inc/fmod_output.h
             ${AUTOBUILD_INSTALL_DIR}/include/fmodstudio/
           COMMAND cp
-            /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core/lib/libfmod.dylib
             ${AUTOBUILD_INSTALL_DIR}/lib/release/
+          WORKING_DIRECTORY /Volumes/FMOD\ Programmers\ API\ Mac/FMOD\ Programmers\ API/api/core
           )
         execute_process(
-          COMMAND hdiutil detach /Volumes/FMOD\ Programmers\ API\ Mac
-          WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-          RESULT_VARIABLE ${_binary}_installed
+          COMMAND hdiutil detach FMOD\ Programmers\ API\ Mac
+          WORKING_DIRECTORY /Volumes
+          RESULT_VARIABLE fmodstudio_installed
           )
       else (DARWIN)
         execute_process(
-          COMMAND tar -xf $ENV{HOME}/Downloads/fmodstudioapi20223linux.tar.gz -C /tmp
           COMMAND mkdir -p ${AUTOBUILD_INSTALL_DIR}/include/fmodstudio
+          COMMAND tar -xf $ENV{HOME}/Downloads/fmodstudioapi20223linux.tar.gz
+          WORKING_DIRECTORY /tmp
           )
         execute_process(
           COMMAND cp
-            /tmp/fmodstudioapi20223linux/api/core/inc/fmod.h
-            /tmp/fmodstudioapi20223linux/api/core/inc/fmod.hpp
-            /tmp/fmodstudioapi20223linux/api/core/inc/fmod_codec.h
-            /tmp/fmodstudioapi20223linux/api/core/inc/fmod_common.h
-            /tmp/fmodstudioapi20223linux/api/core/inc/fmod_dsp.h
-            /tmp/fmodstudioapi20223linux/api/core/inc/fmod_dsp_effects.h
-            /tmp/fmodstudioapi20223linux/api/core/inc/fmod_errors.h
-            /tmp/fmodstudioapi20223linux/api/core/inc/fmod_output.h
+            inc/fmod.h
+            inc/fmod.hpp
+            inc/fmod_codec.h
+            inc/fmod_common.h
+            inc/fmod_dsp.h
+            inc/fmod_dsp_effects.h
+            inc/fmod_errors.h
+            inc/fmod_output.h
             ${AUTOBUILD_INSTALL_DIR}/include/fmodstudio/
           COMMAND cp -P
-            /tmp/fmodstudioapi20223linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
-            /tmp/fmodstudioapi20223linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
-            /tmp/fmodstudioapi20223linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.23
+            lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
+            lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
+            lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.23
             ${AUTOBUILD_INSTALL_DIR}/lib/release/
+          WORKING_DIRECTORY /tmp/fmodstudioapi20223linux/api/core
           )
         execute_process(
           COMMAND rm -rf fmodstudioapi20223linux
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index c6f1423322..b59c5b3a38 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -9,12 +9,9 @@ if (USESYSTEMLIBS)
     if (DARWIN)
         if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
             if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/vlc_installed OR NOT ${vlc_installed} EQUAL 0)
-                execute_process(COMMAND curl
-                    -L
-                    https://get.videolan.org/vlc/3.0.21/macosx/vlc-3.0.21-arm64.dmg
-                    -o
-                    $ENV{HOME}/Downloads/vlc-3.0.21-arm64.dmg
-                    WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
+                execute_process(
+                    COMMAND curl -OL https://get.videolan.org/vlc/3.0.21/macosx/vlc-3.0.21-arm64.dmg
+                    WORKING_DIRECTORY $ENV{HOME}/Downloads
                     RESULT_VARIABLE vlc_installed
                     )
                 file(WRITE ${PREBUILD_TRACKING_DIR}/vlc_installed "${vlc_installed}")
@@ -22,12 +19,9 @@ if (USESYSTEMLIBS)
             execute_process(COMMAND hdiutil attach -noverify $ENV{HOME}/Downloads/vlc-3.0.21-arm64.dmg)
         else (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
             if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/vlc_installed OR NOT ${vlc_installed} EQUAL 0)
-                execute_process(COMMAND curl
-                    -L
-                    https://get.videolan.org/vlc/3.0.21/macosx/vlc-3.0.21-intel64.dmg
-                    -o
-                    $ENV{HOME}/Downloads/vlc-3.0.21-intel64.dmg
-                    WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
+                execute_process(
+                    COMMAND curl -OL https://get.videolan.org/vlc/3.0.21/macosx/vlc-3.0.21-intel64.dmg
+                    WORKING_DIRECTORY $ENV{HOME}/Downloads
                     RESULT_VARIABLE vlc_installed
                     )
                 file(WRITE ${PREBUILD_TRACKING_DIR}/vlc_installed "${vlc_installed}")
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index f57dbb1be6..1e95dfdc01 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -49,9 +49,9 @@ if (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR NOT USESYSTEMLIBS)
         WORKING_DIRECTORY /tmp/meshoptimizer-0.21
         )
       execute_process(
-        COMMAND cp /tmp/meshoptimizer-0.21/src/meshoptimizer.h ${AUTOBUILD_INSTALL_DIR}/include/meshoptimizer/
-        COMMAND cp /tmp/meshoptimizer-0.21/libmeshoptimizer.a ${AUTOBUILD_INSTALL_DIR}/lib/release/
-        WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
+        COMMAND cp src/meshoptimizer.h ${AUTOBUILD_INSTALL_DIR}/include/meshoptimizer/
+        COMMAND cp libmeshoptimizer.a ${AUTOBUILD_INSTALL_DIR}/lib/release/
+        WORKING_DIRECTORY /tmp/meshoptimizer-0.21
         )
       execute_process(
         COMMAND rm -rf meshoptimizer-0.21
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 4a735e0041..33323cac28 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -34,11 +34,11 @@ if (USESYSTEMLIBS AND (${LINUX_DISTRO} MATCHES fedora OR DARWIN OR CMAKE_SYSTEM_
       )
     execute_process(
       COMMAND cp
-        /tmp/openjpeg-2.5.2/src/lib/openjp2/cio.h
-        /tmp/openjpeg-2.5.2/src/lib/openjp2/event.h
-        /tmp/openjpeg-2.5.2/src/lib/openjp2/opj_config_private.h
+        cio.h
+        event.h
+        opj_config_private.h
         ${AUTOBUILD_INSTALL_DIR}/include/openjpeg-2.5/
-      WORKING_DIRECTORY ${AUTOBUILD_INSTALL_DIR}
+      WORKING_DIRECTORY /tmp/openjpeg-2.5.2/src/lib/openjp2
       )
     execute_process(
       COMMAND rm -rf openjpeg-2.5.2