Merge branch 'master' into OpenGL2

diff --combined cmake/dependencies.cmake
index ef74409c2d9c59dcf0de030f08df7c488356c44d,bdd63163dd9f99822bef2e5d4743d0817d840f3e..7aafbbcbc2c18f2568ff1f6c708a327e3fe963c7
--- 1/cmake/dependencies.cmake
--- 2/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@@ -31,9 -31,6 +31,9 @@@ if(VTK_FOUND
        vtkQVTK
      )
    endif(VTK_VERSION VERSION_LESS 5.6.0)
 +  if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
 +    add_definitions(-DVTKGL2)
 +  endif()
  else(VTK_FOUND)
    message(FATAL_ERROR "Please set VTK_DIR.")
  endif(VTK_FOUND)
@@@ -47,15 -44,15 +47,15 @@@ find_package(Gengetopt
  
  #=========================================================
  # Find libstatgrab is installed, add clitkMemoryUsage.cxx in the library
- if(NOT DEFINED CLITK_MEMORY_INFO OR CLITK_MEMORY_INFO)
-   find_library(LIBSTATGRAB NAMES statgrab PATHS)
-   if(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+ #if(NOT DEFINED CLITK_MEMORY_INFO OR CLITK_MEMORY_INFO)
+ #  find_library(LIBSTATGRAB NAMES statgrab PATHS)
+ #  if(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
  #  message("Install libstatgrab (http://www.i-scream.org/libstatgrab/) for memory usage information")
      set(CLITK_MEMORY_INFO OFF)
-   else(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
-     set(CLITK_MEMORY_INFO ON)
-   endif(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
- endif()
+ #  else(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+ #    set(CLITK_MEMORY_INFO ON)
+ #  endif(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+ #endif()
  #=========================================================