Merge pull request #1115 from manongjohn/revert_linux_build_environment
Revert Linux builds to Ubuntu 18.04
This commit is contained in:
commit
ddbd6ab197
3 changed files with 7 additions and 4 deletions
2
.github/workflows/linux_build.yml
vendored
2
.github/workflows/linux_build.yml
vendored
|
@ -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 ]
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
cmake_policy(SET 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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue