From 05797320f4d02e140fa9b0537ec2bcf12763977b Mon Sep 17 00:00:00 2001 From: manongjohn <19245851+manongjohn@users.noreply.github.com> Date: Mon, 19 Dec 2022 22:45:06 -0500 Subject: [PATCH] Revert Linux builds to Ubuntu 18.04 --- .github/workflows/linux_build.yml | 2 +- ci-scripts/linux/tahoma-install.sh | 2 +- toonz/sources/CMakeLists.txt | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 32838578..9fd3f99c 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: Linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-18.04 strategy: matrix: compiler: [ gcc, clang ] diff --git a/ci-scripts/linux/tahoma-install.sh b/ci-scripts/linux/tahoma-install.sh index e57c2556..395243ad 100755 --- a/ci-scripts/linux/tahoma-install.sh +++ b/ci-scripts/linux/tahoma-install.sh @@ -1,5 +1,5 @@ #!/bin/bash -sudo add-apt-repository --yes ppa:beineri/opt-qt-5.15.2-focal +sudo add-apt-repository --yes ppa:beineri/opt-qt-5.15.2-bionic sudo apt-get update sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt515script libsuperlu-dev qt515svg qt515tools qt515multimedia wget libboost-all-dev liblzma-dev libjson-c-dev libjpeg-turbo8-dev libturbojpeg0-dev libglib2.0-dev qt515serialport # Removed: libopenjpeg-dev diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 96f09f11..c9adbf70 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -1,5 +1,8 @@ -cmake_policy(SET CMP0141 NEW) -set(CMAKE_POLICY_DEFAULT_CMP0141 NEW) +if(WIN32 AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.25.0") + message("Enabling CMP0141") + cmake_policy(SET CMP0141 NEW) + set(CMAKE_POLICY_DEFAULT_CMP0141 NEW) +endif() cmake_minimum_required(VERSION 2.8.11)