Fix deficiencies of  standard FindOpenGL on OSX and using X11