Skip to content

Commit

Permalink
Reverting to cmake 3.29.
Browse files Browse the repository at this point in the history
    Updated to latest tlRender.
  • Loading branch information
ggarra13 committed Apr 10, 2024
1 parent b1a1692 commit 5f1bc3c
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 16 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/full_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/full_macos12.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ jobs:
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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/full_macos14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ jobs:
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
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/full_win64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions etc/build_dir.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,6 @@ extract_version
#
extract_python_version

#
# Extract cmake version
#
get_cmake_version

#
# Determine OS Kernel, OS CPU architecture
#
Expand Down Expand Up @@ -99,6 +94,11 @@ fi

export PATH="$PWD/${BUILD_DIR}/install/bin:$PWD/$BUILD_DIR/install/bin/Scripts:${PATH}"

#
# Extract cmake version
#
get_cmake_version

#
# We set both lib64 and lib to handle differences in Linux RH and Ubuntu
#
Expand Down
37 changes: 29 additions & 8 deletions etc/install_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,47 @@
# mrv2
# Copyright Contributors to the mrv2 Project. All rights reserved.

echo "Getting latest release of cmake"
CMAKE_RELEASE=3.29.0
CMAKE_PLATFORM=macos-universal
CMAKE_EXT=tar.gz

echo "Getting latest release of cmake"
. ./etc/build_dir.sh

echo "Will install it in $PWD/$BUILD_DIR/install.."
if [[ $KERNEL == *Linux* ]]; then
CMAKE_PLATFORM=linux-x86_64
CMAKE_EXT=tar.gz
elif [[ $KERNEL == *Msys* ]]; then
CMAKE_PLATFORM=windows-x86_64
CMAKE_EXT=zip
fi

echo "Downloading cmake..."
wget -c -q https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.tar.gz
wget -c -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_RELEASE}/cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}.${CMAKE_EXT}

echo "Decompressing archive..."
tar -xf cmake-3.26.3-linux-x86_64.tar.gz

echo "Installing..."
echo "Creating install dir..."
if [[ ! -d $PWD/$BUILD_DIR/install/ ]]; then
mkdir -p $PWD/$BUILD_DIR/install/
fi
mv -f cmake-3.26.3-linux-x86_64/* $PWD/$BUILD_DIR/install/

echo "Decompressing archive..."
if [[ $KERNEL != *Msys* ]]; then
tar -xf cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}.${CMAKE_EXT}
else
unzip cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}.${CMAKE_EXT}
fi

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-3.26.3-linux-x86_64*
rm -rf cmake-${CMAKE_RELEASE}-${CMAKE_PLATFORM}*


echo "Checking executable is there:"
ls $BUILD_DIR/install/bin
Expand Down
2 changes: 1 addition & 1 deletion tlRender

0 comments on commit 5f1bc3c

Please sign in to comment.