ci: Some minor llvm dependency improvements

.github/workflows/build-steps.yml

@@ -125,6 +125,11 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: '0'
+      - name: Install LLVM and Clang
+        if: inputs.llvm_action_ver != ''
+        uses: KyleMayes/install-llvm-action@ebc0426251bc40c7cd31162802432c68818ab8f0 # v2.0.9
+        with:
+          version: ${{ inputs.llvm_action_ver }}
       - name: Build setup
         shell: bash
         run: |
@@ -142,11 +147,6 @@ jobs:
           # path: ./ccache
           key: ${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
           restore-keys: ${{inputs.nametag}}
-      - name: Install LLVM and Clang
-        if: inputs.llvm_action_ver != ''
-        uses: KyleMayes/install-llvm-action@ebc0426251bc40c7cd31162802432c68818ab8f0 # v2.0.9
-        with:
-          version: ${{ inputs.llvm_action_ver }}
       - name: Dependencies
         shell: bash
         run: |

.github/workflows/ci.yml

@@ -580,6 +580,7 @@ jobs:
       depcmds: ${{ matrix.depcmds }}
       extra_artifacts: ${{ matrix.extra_artifacts }}
       fmt_ver: ${{ matrix.fmt_ver }}
+      llvm_action_ver: ${{ matrix.llvm_action_ver }}
       opencolorio_ver: ${{ matrix.opencolorio_ver }}
       openexr_ver: ${{ matrix.openexr_ver }}
       openimageio_ver: ${{ matrix.openimageio_ver }}

src/build-scripts/gh-win-installdeps.bash

@@ -121,8 +121,10 @@ echo "DEP_DIR $DEP_DIR :"
 ls -R -l "$DEP_DIR"
 
 if [[ "$LLVM_VERSION" != "" ]] ; then
+    echo "Running llvm_build.bash"
     source src/build-scripts/build_llvm.bash
 elif [[ "$LLVM_GOOGLE_DRIVE_ID" != "" ]] then
+    echo "Installing LLVM from google drive"
     mkdir -p $HOME/llvm
     pushd $HOME/llvm
     #LLVM_GOOGLE_DRIVE_ID="1uy7PNVlTQ-H56unXGOS6siRWtNcdS1J7"
@@ -131,6 +133,8 @@ elif [[ "$LLVM_GOOGLE_DRIVE_ID" != "" ]] then
     unzip $LLVM_ZIP_FILENAME > /dev/null
     export LLVM_ROOT=$PWD/llvm-build
     popd
+else
+    export LLVM_ROOT=$LLVM_PATH
 fi
 echo "LLVM_ROOT = $LLVM_ROOT"
 

src/cmake/dependency_utils.cmake

@@ -133,8 +133,8 @@ function (handle_package_notfound pkgname required)
     message (STATUS "${ColorRed}${pkgname} library not found ${ColorReset}")
     if (${pkgname}_ROOT)
         message (STATUS "    ${pkgname}_ROOT was: ${${pkgname}_ROOT}")
-    elseif ($ENV{${pkgname}_ROOT})
-        message (STATUS "    ENV ${pkgname}_ROOT was: ${${pkgname}_ROOT}")
+    elseif (DEFINED ENV{${pkgname}_ROOT})
+        message (STATUS "    ENV ${pkgname}_ROOT was: $ENV{${pkgname}_ROOT}")
     else ()
         message (STATUS "    Try setting ${pkgname}_ROOT ?")
     endif ()

src/cmake/modules/FindLLVM.cmake

@@ -25,6 +25,9 @@
 if (LLVM_DIRECTORY)
     list (APPEND LLVM_CONFIG_PATH_HINTS "${LLVM_DIRECTORY}/bin")
 endif ()
+if (LLVM_PATH)
+    list (APPEND LLVM_CONFIG_PATH_HINTS "${LLVM_PATH}/bin")
+endif ()
 if (LLVM_ROOT)
     list (APPEND LLVM_CONFIG_PATH_HINTS "${LLVM_ROOT}/bin")
 endif ()