diff --git a/CMake/options.cmake b/CMake/options.cmake
index 8beedf85a..2725d6c79 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -129,11 +129,12 @@ endif(HAVE_GL)
 
 if(OPTION_USE_GL)
    if(OPTION_APPLE_X11)
-#     find_library(OPENGL_gl_LIBRARY GL)
-#     find_library(OPENGL_glu_LIBRARY GLU)
-      set(OPENGL_LIBRARIES /opt/X11/lib/libGL.dylib  /opt/X11/lib/libGLU.dylib)
+      set(OPENGL_FOUND TRUE)
+      get_filename_component(PATH_TO_XLIBS ${X11_X11_LIB} PATH)
+      set(OPENGL_LIBRARIES -L${PATH_TO_XLIBS} -lGLU -lGL)
+   else()
+      include(FindOpenGL)
    endif(OPTION_APPLE_X11)
-   include(FindOpenGL)
 endif(OPTION_USE_GL)
 
 if(OPENGL_FOUND)