Skip to content

Commit

Permalink
Merge pull request #75 from JohT/renovate/cpm-cmake-cpm.cmake-0.x
Browse files Browse the repository at this point in the history
Update dependency cpm-cmake/CPM.cmake to v0.40.4
  • Loading branch information
JohT authored Dec 24, 2024
2 parents 2e8cfce + c69d030 commit e771857
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ env:
PROJECT_NAME: Speclet # Must match the JUCE project name from juce_add_plugin
BUILD_TYPE: Release
BUILD_DIR: Builds
GNU_COMPILER_VERSION: 13
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PLUGINVAL_VERSION: v1.0.4
DISPLAY: :0 # linux pluginval needs this
Expand All @@ -44,18 +45,19 @@ jobs:
artifact: MacOS

steps:
- name: Install JUCE's Linux Dependencies and select g++ 10
- name: Install JUCE's Linux Dependencies and select g++ ${{ env.GNU_COMPILER_VERSION }}
if: runner.os == 'Linux'
# Thanks to McMartin & co https://forum.juce.com/t/list-of-juce-dependencies-under-linux/15121/44
# Added further dependencies from https://github.com/Tracktion/pluginval/blob/develop/.github/workflows/build.yaml
run: |
sudo apt-get update && sudo apt install libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev ccache xvfb
sudo apt-get update
sudo apt install -y g++-${{ env.GNU_COMPILER_VERSION }} gcc-${{ env.GNU_COMPILER_VERSION }} libasound2-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.1-dev libglu1-mesa-dev ccache xvfb
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get install -y freeglut3-dev g++ libcurl4-openssl-dev libjack-jackd2-dev libxcomposite-dev libxcursor-dev libxrandr-dev mesa-common-dev ladspa-sdk libgtk-3-dev
# Starting Virtual Frame Buffer X Server (Xvfb) as local display in the background
sudo /usr/bin/Xvfb $DISPLAY &
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ env.GNU_COMPILER_VERSION }} ${{ env.GNU_COMPILER_VERSION }}
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${{ env.GNU_COMPILER_VERSION }} ${{ env.GNU_COMPILER_VERSION }}
# This block can be removed once 15.1 is default
# JUCE requires it when building on macOS 14
Expand Down
2 changes: 1 addition & 1 deletion cmake/Environment.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# Download "cpm", the setup-free CMake dependency management
# https://github.com/cpm-cmake/CPM.cmake
set(CPM_DOWNLOAD_VERSION 0.40.2)
set(CPM_DOWNLOAD_VERSION 0.40.4)
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
if(NOT (EXISTS ${CPM_DOWNLOAD_LOCATION}))
message(STATUS "Downloading CPM.cmake")
Expand Down

0 comments on commit e771857

Please sign in to comment.