Merge pull request #359 from baszalmstra/replace-require-gl

replace REQUIRE_GL with libgl-devel and REQUIRE_OPENGL with libopengl-devel

Author: Tobias-Fischer

robostack.yaml

@@ -154,9 +154,16 @@ gtest:
 gtk2:
   robostack: [gtk2]
 gtk3:
-  robostack: [libglib, glib, gtk3, harfbuzz, libxcb, pthread-stubs, xorg-libxau, xorg-libxi,
-    xorg-libxrandr, xorg-libxcursor, xorg-libxtst, xorg-libxcomposite, xorg-libxdamage,
-    xorg-libxinerama, xorg-xineramaproto, epoxy, REQUIRE_GL]
+  robostack:
+    linux: [libglib, glib, gtk3, harfbuzz, libxcb, pthread-stubs, xorg-libxau, xorg-libxi,
+      xorg-libxrandr, xorg-libxcursor, xorg-libxtst, xorg-libxcomposite, xorg-libxdamage,
+      xorg-libxinerama, xorg-xineramaproto, epoxy, libgl-devel]
+    osx: [libglib, glib, gtk3, harfbuzz, libxcb, pthread-stubs, xorg-libxau, xorg-libxi,
+      xorg-libxrandr, xorg-libxcursor, xorg-libxtst, xorg-libxcomposite, xorg-libxdamage,
+      xorg-libxinerama, xorg-xineramaproto, epoxy]
+    win64: [libglib, glib, gtk3, harfbuzz, libxcb, pthread-stubs, xorg-libxau, xorg-libxi,
+      xorg-libxrandr, xorg-libxcursor, xorg-libxtst, xorg-libxcomposite, xorg-libxdamage,
+      xorg-libxinerama, xorg-xineramaproto, epoxy]
 ignition-common4:
   robostack: [libignition-common4]
 ignition-cmake2:
@@ -381,13 +388,22 @@ libomp-dev:
     osx: [llvm-openmp]
     win64: []
 libopen3d-dev:
-  robostack: [open3d, REQUIRE_OPENGL]
+  robostack:
+    linux: [open3d, libopengl-devel, libgl-devel]
+    osx: [open3d]
+    win64: [open3d]
 libopenblas-dev:
   robostack: [libblas]
 libopencv-dev:
-  robostack: [py-opencv, libopencv, REQUIRE_OPENGL]
+  robostack:
+    linux: [py-opencv, libopencv, libopengl-devel, libgl-devel]
+    osx: [py-opencv, libopencv]
+    win64: [py-opencv, libopencv]
 libopencv-imgproc-dev:
-  robostack: [py-opencv, libopencv, REQUIRE_OPENGL]
+  robostack:
+    linux: [py-opencv, libopencv, libopengl-devel, libgl-devel]
+    osx: [py-opencv, libopencv]
+    win64: [py-opencv, libopencv]
 libopenni-dev:
   robostack: []
 liborocos-kdl:
@@ -399,7 +415,10 @@ libpcap:
 libpcl-all:
   robostack: [pcl]
 libpcl-all-dev:
-  robostack: [pcl, libboost-devel, vtk-base, REQUIRE_OPENGL]
+  robostack:
+    linux: [pcl, libboost-devel, vtk-base, libopengl-devel, libgl-devel]
+    osx: [pcl, libboost-devel, vtk-base]
+    win64: [pcl, libboost-devel, vtk-base]
 libpng-dev:
   robostack: [libpng]
 libpoco-dev:
@@ -415,23 +434,50 @@ libqglviewer-dev-qt5:
 libqhull:
   robostack: [qhull]
 libqt5-core:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libqt5-gui:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libqt5-opengl:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libqt5-opengl-dev:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libqt5-svg:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libqt5-svg-dev:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libqt5-websockets-dev:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libqt5-widgets:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libqt5x11extras5-dev:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 libreadline:
   robostack: [readline]
 libreadline-dev:
@@ -495,9 +541,15 @@ libvulkan-dev:
     osx: []
     win64: [libvulkan-headers, libvulkan-loader]
 libx11:
-  robostack: [xorg-libx11, xorg-xorgproto, REQUIRE_OPENGL]
+  robostack:
+    linux: [xorg-libx11, xorg-xorgproto, libopengl-devel, libgl-devel]
+    osx: [xorg-libx11, xorg-xorgproto]
+    win64: [xorg-libx11, xorg-xorgproto]
 libx11-dev:
-  robostack: [xorg-libx11, xorg-xorgproto, REQUIRE_OPENGL]
+  robostack:
+    linux: [xorg-libx11, xorg-xorgproto, libopengl-devel, libgl-devel]
+    osx: [xorg-libx11, xorg-xorgproto]
+    win64: [xorg-libx11, xorg-xorgproto]
 libxaw:
   robostack:
     linux: [xorg-libxaw]
@@ -523,7 +575,10 @@ libxrandr:
 libxt-dev:
   robostack: [xorg-libxt]
 libxxf86vm:
-  robostack: [REQUIRE_OPENGL]
+  robostack:
+    linux: [libopengl-devel, libgl-devel]
+    osx: []
+    win64: []
 libyaml:
   robostack: [yaml]
 libyaml-dev:
@@ -567,8 +622,8 @@ ocl-icd-opencl-dev:
   robostack: [ocl-icd]
 opengl:
   robostack:
-    linux: [REQUIRE_OPENGL]
-    osx: [REQUIRE_OPENGL]
+    linux: [libopengl-devel, libgl-devel]
+    osx: []
     win64: []
 openssl:
   robostack: [openssl]
@@ -653,7 +708,10 @@ python-numpy:
 python-opencv:
   robostack: [py-opencv, libopencv]
 python-opengl:
-  robostack: [pyopengl, REQUIRE_OPENGL]
+  robostack:
+    linux: [pyopengl, libopengl-devel, libgl-devel]
+    osx: [pyopengl]
+    win64: [pyopengl]
 python-paramiko:
   robostack: [paramiko]
 python-psutil:
@@ -805,7 +863,10 @@ python3-numpy:
 python3-opencv:
   robostack: [py-opencv, libopencv]
 python3-opengl:
-  robostack: [pyopengl, REQUIRE_OPENGL]
+  robostack:
+    linux: [pyopengl, libopengl-devel, libgl-devel]
+    osx: [pyopengl]
+    win64: [pyopengl]
 python3-packaging:
   robostack: [packaging]
 python3-pandas:
@@ -929,11 +990,20 @@ python3-yaml:
 python3-zmq:
   robostack: [pyzmq]
 qt5-image-formats-plugins:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 qt5-qmake:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 qtbase5-dev:
-  robostack: [qt-main, REQUIRE_OPENGL]
+  robostack:
+    linux: [qt-main, libopengl-devel, libgl-devel]
+    osx: [qt-main]
+    win64: [qt-main]
 range-v3:
   robostack: [range-v3]
 rapidjson-dev:
@@ -1025,7 +1095,10 @@ wxpython:
 wxwidgets:
   robostack: [wxpython]
 x11-dev:
-  robostack: [xorg-libx11, REQUIRE_OPENGL]
+  robostack:
+    linux: [xorg-libx11, libopengl-devel, libgl-devel]
+    osx: [xorg-libx11]
+    win64: [xorg-libx11]
 yaml:
   robostack: [yaml, yaml-cpp]
 yaml-cpp: