razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Revert "Revert Linux builds to Ubuntu 18.04"

Browse source 
This reverts commit 05797320f4.
This commit is contained in:
manongjohn 2023-04-07 15:40:00 -04:00
parent 15a22a41fb
commit c4f481b611
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/linux_build.yml vendored
View file

@ -4,7 +4,7 @@ on: [push, pull_request]
jobs: jobs:
Linux: Linux:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
compiler: [ gcc, clang ] compiler: [ gcc, clang ]

2
ci-scripts/linux/tahoma-install.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
sudo add-apt-repository --yes ppa:beineri/opt-qt-5.15.2-bionic sudo add-apt-repository --yes ppa:beineri/opt-qt-5.15.2-focal
sudo apt-get update 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 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 # Removed: libopenjpeg-dev

5
toonz/sources/CMakeLists.txt
View file

@ -1,8 +1,5 @@
if(WIN32 AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.25.0") cmake_policy(SET CMP0141 NEW)
message("Enabling CMP0141")
cmake_policy(SET CMP0141 NEW)
set(CMAKE_POLICY_DEFAULT_CMP0141 NEW) set(CMAKE_POLICY_DEFAULT_CMP0141 NEW)
endif()
cmake_minimum_required(VERSION 2.8.11) cmake_minimum_required(VERSION 2.8.11)