diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 184ffedd..bfcf4443 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -180,13 +180,6 @@ jobs: with: xcode-version: '${{matrix.settings.compiler.version}}' - - name: Install Linux System Packages - if: contains( matrix.settings.os, 'ubuntu') - run: | - sudo apt-get -y install libgl-dev - sudo apt-get -y install libopengl-dev - sudo apt-get -y install libglu1-mesa-dev - - name: Set up Python uses: actions/setup-python@v4.7.1 with: diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 7777c9f1..e2e468ae 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -95,13 +95,6 @@ jobs: sudo apt-get install libdatetime-perl - - name: Install Linux System Packages - shell: bash - run: | - sudo apt-get -y install libgl-dev - sudo apt-get -y install libopengl-dev - sudo apt-get -y install libglu1-mesa-dev - - name: Set up Python uses: actions/setup-python@v4.7.1 with: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 607e8421..f379eeec 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -62,13 +62,6 @@ jobs: version: ${{ env.COMPILER_VERSION }} platform: x64 - - name: Install Linux System Packages - shell: bash - run: | - sudo apt-get -y install libgl-dev - sudo apt-get -y install libopengl-dev - sudo apt-get -y install libglu1-mesa-dev - - name: Set up Python uses: actions/setup-python@v4.7.1 with: diff --git a/conanfile.py b/conanfile.py index 3ead6cb9..91a675fc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -27,6 +27,7 @@ from conan.tools.files import copy from conan.tools.scm import Version from conan.tools.files import load +from conan.tools.system.package_manager import Apt import re, os.path import subprocess import sys @@ -174,6 +175,11 @@ def requirements(self): if self.useFMT: self.requires("fmt/10.2.1") + def system_requirements(self): + if self.options.get_safe("with_rs_opengl", False): + apt = Apt(self) + apt.install(["libgl-dev", "libopengl-dev", "libglu1-mesa-dev"], update=True, check=True) + # @property # def _source_subfolder(self): # return "source_subfolder"