Skip to content

Commit f05807a

Browse files
authored
replace REQUIRE_GL with libgl-devel and REQUIRE_OPENGL with libopengl-devel (#555)
* replace REQUIRE_GL with libgl-devel and REQUIRE_OPENGL with libopengl-devel * use conditional to only use gl on linux * add libgl when using libopengl * remove if selectors
1 parent c650c11 commit f05807a

1 file changed

Lines changed: 101 additions & 28 deletions

File tree

robostack.yaml

Lines changed: 101 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,16 @@ gtest:
155155
gtk2:
156156
robostack: [gtk2]
157157
gtk3:
158-
robostack: [libglib, glib, gtk3, harfbuzz, libxcb, pthread-stubs, xorg-libxau, xorg-libxi,
159-
xorg-libxrandr, xorg-libxcursor, xorg-libxtst, xorg-libxcomposite, xorg-libxdamage,
160-
xorg-libxinerama, xorg-xineramaproto, epoxy, REQUIRE_GL]
158+
robostack:
159+
linux: [libglib, glib, gtk3, harfbuzz, libxcb, pthread-stubs, xorg-libxau, xorg-libxi,
160+
xorg-libxrandr, xorg-libxcursor, xorg-libxtst, xorg-libxcomposite, xorg-libxdamage,
161+
xorg-libxinerama, xorg-xineramaproto, epoxy, libgl-devel]
162+
osx: [libglib, glib, gtk3, harfbuzz, libxcb, pthread-stubs, xorg-libxau, xorg-libxi,
163+
xorg-libxrandr, xorg-libxcursor, xorg-libxtst, xorg-libxcomposite, xorg-libxdamage,
164+
xorg-libxinerama, xorg-xineramaproto, epoxy]
165+
win64: [libglib, glib, gtk3, harfbuzz, libxcb, pthread-stubs, xorg-libxau, xorg-libxi,
166+
xorg-libxrandr, xorg-libxcursor, xorg-libxtst, xorg-libxcomposite, xorg-libxdamage,
167+
xorg-libxinerama, xorg-xineramaproto, epoxy]
161168
ignition-common4:
162169
robostack: [libignition-common4]
163170
ignition-cmake2:
@@ -333,7 +340,10 @@ libhdf5-dev:
333340
libi2c-dev:
334341
robostack: [libi2c]
335342
liblttng-ust-dev:
336-
robostack: ["${{ \"lttng-ust\" if linux }}"]
343+
robostack:
344+
linux: ["lttng-ust"]
345+
osx: []
346+
win64: []
337347
libjpeg:
338348
robostack: [libjpeg-turbo]
339349
libjsoncpp:
@@ -377,9 +387,15 @@ libomp-dev:
377387
libopenblas-dev:
378388
robostack: [libblas]
379389
libopencv-dev:
380-
robostack: [py-opencv, libopencv, REQUIRE_OPENGL]
390+
robostack:
391+
linux: [py-opencv, libopencv, libopengl-devel, libgl-devel]
392+
osx: [py-opencv, libopencv]
393+
win64: [py-opencv, libopencv]
381394
libopencv-imgproc-dev:
382-
robostack: [py-opencv, libopencv, REQUIRE_OPENGL]
395+
robostack:
396+
linux: [py-opencv, libopencv, libopengl-devel, libgl-devel]
397+
osx: [py-opencv, libopencv]
398+
win64: [py-opencv, libopencv]
383399
libopenni-dev:
384400
robostack: []
385401
liborocos-kdl:
@@ -391,7 +407,10 @@ libpcap:
391407
libpcl-all:
392408
robostack: [pcl]
393409
libpcl-all-dev:
394-
robostack: [pcl, libboost-devel, vtk-base, REQUIRE_OPENGL]
410+
robostack:
411+
linux: [pcl, libboost-devel, vtk-base, libopengl-devel, libgl-devel]
412+
osx: [pcl, libboost-devel, vtk-base]
413+
win64: [pcl, libboost-devel, vtk-base]
395414
libpng-dev:
396415
robostack: [libpng]
397416
libpoco-dev:
@@ -407,23 +426,50 @@ libqglviewer-dev-qt5:
407426
libqhull:
408427
robostack: [qhull]
409428
libqt5-core:
410-
robostack: [qt-main, REQUIRE_OPENGL]
429+
robostack:
430+
linux: [qt-main, libopengl-devel, libgl-devel]
431+
osx: [qt-main]
432+
win64: [qt-main]
411433
libqt5-gui:
412-
robostack: [qt-main, REQUIRE_OPENGL]
434+
robostack:
435+
linux: [qt-main, libopengl-devel, libgl-devel]
436+
osx: [qt-main]
437+
win64: [qt-main]
413438
libqt5-opengl:
414-
robostack: [qt-main, REQUIRE_OPENGL]
439+
robostack:
440+
linux: [qt-main, libopengl-devel, libgl-devel]
441+
osx: [qt-main]
442+
win64: [qt-main]
415443
libqt5-opengl-dev:
416-
robostack: [qt-main, REQUIRE_OPENGL]
444+
robostack:
445+
linux: [qt-main, libopengl-devel, libgl-devel]
446+
osx: [qt-main]
447+
win64: [qt-main]
417448
libqt5-svg:
418-
robostack: [qt-main, REQUIRE_OPENGL]
449+
robostack:
450+
linux: [qt-main, libopengl-devel, libgl-devel]
451+
osx: [qt-main]
452+
win64: [qt-main]
419453
libqt5-svg-dev:
420-
robostack: [qt-main, REQUIRE_OPENGL]
454+
robostack:
455+
linux: [qt-main, libopengl-devel, libgl-devel]
456+
osx: [qt-main]
457+
win64: [qt-main]
421458
libqt5-websockets-dev:
422-
robostack: [qt-main, REQUIRE_OPENGL]
459+
robostack:
460+
linux: [qt-main, libopengl-devel, libgl-devel]
461+
osx: [qt-main]
462+
win64: [qt-main]
423463
libqt5-widgets:
424-
robostack: [qt-main, REQUIRE_OPENGL]
464+
robostack:
465+
linux: [qt-main, libopengl-devel, libgl-devel]
466+
osx: [qt-main]
467+
win64: [qt-main]
425468
libqt5x11extras5-dev:
426-
robostack: [qt-main, REQUIRE_OPENGL]
469+
robostack:
470+
linux: [qt-main, libopengl-devel, libgl-devel]
471+
osx: [qt-main]
472+
win64: [qt-main]
427473
libreadline:
428474
robostack: [readline]
429475
libreadline-dev:
@@ -482,14 +528,20 @@ libvtk:
482528
libvtk-qt:
483529
robostack: [vtk]
484530
libvulkan-dev:
485-
robostack:
531+
robostack:
486532
linux: [libvulkan-headers, libvulkan-loader]
487533
osx: []
488534
win64: [libvulkan-headers, libvulkan-loader]
489535
libx11:
490-
robostack: [xorg-libx11, xorg-xorgproto, REQUIRE_OPENGL]
536+
robostack:
537+
linux: [xorg-libx11, xorg-xorgproto, libopengl-devel, libgl-devel]
538+
osx: [xorg-libx11, xorg-xorgproto]
539+
win64: [xorg-libx11, xorg-xorgproto]
491540
libx11-dev:
492-
robostack: [xorg-libx11, xorg-xorgproto, REQUIRE_OPENGL]
541+
robostack:
542+
linux: [xorg-libx11, xorg-xorgproto, libopengl-devel, libgl-devel]
543+
osx: [xorg-libx11, xorg-xorgproto]
544+
win64: [xorg-libx11, xorg-xorgproto]
493545
libxaw:
494546
robostack:
495547
linux: [xorg-libxaw]
@@ -515,7 +567,10 @@ libxrandr:
515567
libxt-dev:
516568
robostack: [xorg-libxt]
517569
libxxf86vm:
518-
robostack: [REQUIRE_OPENGL]
570+
robostack:
571+
linux: [libopengl-devel, libgl-devel]
572+
osx: []
573+
win64: []
519574
libyaml:
520575
robostack: [yaml]
521576
libyaml-dev:
@@ -559,8 +614,8 @@ ocl-icd-opencl-dev:
559614
robostack: [ocl-icd]
560615
opengl:
561616
robostack:
562-
linux: [REQUIRE_OPENGL]
563-
osx: [REQUIRE_OPENGL]
617+
linux: [libopengl-devel, libgl-devel]
618+
osx: []
564619
win64: []
565620
openssl:
566621
robostack: [openssl]
@@ -645,7 +700,10 @@ python-numpy:
645700
python-opencv:
646701
robostack: [py-opencv, libopencv]
647702
python-opengl:
648-
robostack: [pyopengl, REQUIRE_OPENGL]
703+
robostack:
704+
linux: [pyopengl, libopengl-devel, libgl-devel]
705+
osx: [pyopengl]
706+
win64: [pyopengl]
649707
python-paramiko:
650708
robostack: [paramiko]
651709
python-psutil:
@@ -797,7 +855,10 @@ python3-numpy:
797855
python3-opencv:
798856
robostack: [py-opencv, libopencv]
799857
python3-opengl:
800-
robostack: [pyopengl, REQUIRE_OPENGL]
858+
robostack:
859+
linux: [pyopengl, libopengl-devel, libgl-devel]
860+
osx: [pyopengl]
861+
win64: [pyopengl]
801862
python3-packaging:
802863
robostack: [packaging]
803864
python3-pandas:
@@ -921,11 +982,20 @@ python3-yaml:
921982
python3-zmq:
922983
robostack: [pyzmq]
923984
qt5-image-formats-plugins:
924-
robostack: [qt-main, REQUIRE_OPENGL]
985+
robostack:
986+
linux: [qt-main, libopengl-devel, libgl-devel]
987+
osx: [qt-main]
988+
win64: [qt-main]
925989
qt5-qmake:
926-
robostack: [qt-main, REQUIRE_OPENGL]
990+
robostack:
991+
linux: [qt-main, libopengl-devel, libgl-devel]
992+
osx: [qt-main]
993+
win64: [qt-main]
927994
qtbase5-dev:
928-
robostack: [qt-main, REQUIRE_OPENGL]
995+
robostack:
996+
linux: [qt-main, libopengl-devel, libgl-devel]
997+
osx: [qt-main]
998+
win64: [qt-main]
929999
rapidjson-dev:
9301000
robostack: [rapidjson]
9311001
roboticstoolbox-python:
@@ -1012,7 +1082,10 @@ wxpython:
10121082
wxwidgets:
10131083
robostack: [wxpython]
10141084
x11-dev:
1015-
robostack: [xorg-libx11, REQUIRE_OPENGL]
1085+
robostack:
1086+
linux: [xorg-libx11, libopengl-devel, libgl-devel]
1087+
osx: [xorg-libx11]
1088+
win64: [xorg-libx11]
10161089
yaml:
10171090
robostack: [yaml, yaml-cpp]
10181091
yaml-cpp:

0 commit comments

Comments
 (0)