Merge pull request #99 from traversaro/removecdt

Drop CDT and use conda-forge packages to provide OpenGL on Linux
conda-forge · Aug 20, 2024 · 3ef90b3 · 3ef90b3
2 parents f69f1b1 + d3f1fbd
commit 3ef90b3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 28 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -11,7 +11,7 @@ source:
 
 build:
   skip: true  # [ppc64le]
-  number: 0
+  number: 1
   run_exports:
     - {{ pin_subpackage(name, max_pin='x') }}
 
@@ -26,8 +26,6 @@ requirements:
     - cmake
     - pkg-config
     - ninja
-    - {{ cdt('mesa-libgl-devel') }}  # [linux]
-    - {{ cdt('mesa-dri-drivers') }}  # [linux]
     - sed  # [unix]
     - diffutils  # [unix]
     - m2-sed  # [win]
@@ -48,6 +46,7 @@ requirements:
     - libosqp
     - osqp-eigen
     - assimp
+    - libgl-devel  # [linux]
     - xorg-libx11  # [linux]
     - xorg-libxrandr  # [linux]
     - xorg-libxfixes  # [linux]

diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt