diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfdf520a7a35d85171a610de6c79e776678ebb53..b44a8b2f159bc6fbfa3d160f0992487630973b32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,7 +265,7 @@ if(ENABLE_BLAS_LAPACK)
     endif(BLAS_FOUND)
   endif(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
   if(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
-    message("WARNING: Could not find Blas or Lapack: most meshing algorithms"
+    message("WARNING: Could not find Blas or Lapack: most meshing algorithms "
             "will not be functional")
   endif(NOT HAVE_BLAS OR NOT HAVE_LAPACK)
 endif(ENABLE_BLAS_LAPACK)
@@ -416,11 +416,12 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
     endif(NOT FLTK_PNG)
   endif(HAVE_LIBZ)
   find_package(OpenGL REQUIRED)
-  if(NOT OPENGL_GLU_FOUND)
-    message(SEND_ERROR "Could not find GLU")
-  endif(NOT OPENGL_GLU_FOUND)
-  add_subdirectory(Graphics)
-  set_config_option(HAVE_OPENGL "OpenGL")
+  if(OPENGL_GLU_FOUND)
+    add_subdirectory(Graphics)
+    set_config_option(HAVE_OPENGL "OpenGL")
+  else(OPENGL_GLU_FOUND)
+    message(SEND_ERROR "Could not find GLU: disabling OpenGL support")
+  endif(OPENGL_GLU_FOUND)
 endif(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS)
 
 if(ENABLE_ANN)
@@ -839,7 +840,7 @@ if(HAVE_LAPACK AND LAPACK_FLAGS)
   set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
 endif(HAVE_LAPACK AND LAPACK_FLAGS)
 if(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)
-  message("WARNING: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library wont link."
+  message("WARNING: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library wont link. "
           "Change in msvc /MT flag to /MD in the shared project properties")
 endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)		  
 target_link_libraries(shared ${LINK_LIBRARIES})