diff --git a/.github/workflows/full_win64.yml b/.github/workflows/full_win64.yml index 27481167c..92c83376d 100644 --- a/.github/workflows/full_win64.yml +++ b/.github/workflows/full_win64.yml @@ -57,7 +57,11 @@ jobs: - name: Set executable permissions run: | chmod +x ./*.sh ./bin/*.sh ./etc/*.sh - + + - name: Install cmake + run: | + ./etc/install_cmake.sh + - name: Build mrv2 run: | ./runme_nolog.sh -t package -D TLRENDER_USD=OFF diff --git a/etc/install_cmake.sh b/etc/install_cmake.sh index 09a9116fa..00a998e99 100755 --- a/etc/install_cmake.sh +++ b/etc/install_cmake.sh @@ -34,7 +34,12 @@ else unzip cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}.${CMAKE_EXT} fi -mv -f cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}/* $PWD/$BUILD_DIR/install/ +if [[ $KERNEL != *Darwin* ]]; then + mv -f cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}/* $PWD/$BUILD_DIR/install/ +elif [[ $KERNEL == *Darwin* ]]; then + mv -f cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}/CMake.app/Contents/* $PWD/$BUILD_DIR/install/ +fi + echo "Cleaning up..." rm -rf cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}*