From 5cdfa52c024b8453ac305663e4f97bd6b6aa5116 Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Feb 25 2021 22:56:05 +0000 Subject: Actions: Update Ubuntu Version (#3729) * actions: update ubuntu version * fixes --- diff --git a/.github/workflows/workflow_linux.yml b/.github/workflows/workflow_linux.yml index e90d9c8..bf02058 100644 --- a/.github/workflows/workflow_linux.yml +++ b/.github/workflows/workflow_linux.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: Ubuntu: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: matrix: compiler: [gcc, clang] @@ -39,7 +39,7 @@ jobs: cd toonz mkdir build cd build - cmake ../sources -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} + cmake ../sources -G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DCMAKE_C_COMPILER=${{ matrix.cc }} -DWITH_TRANSLATION=OFF ninja - name: Create Artifact diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index e785a4c..adcec1c 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -272,7 +272,7 @@ endif() if(PLATFORM EQUAL 64) if(BUILD_ENV_UNIXLIKE) - find_package(OpenCV 3.2 REQUIRED) + find_package(OpenCV REQUIRED) else() # Windows and MacOS case find_package(OpenCV 4.1 REQUIRED) endif()