diff --git a/Modules/ThirdParty/OpenGL/CMakeLists.txt b/Modules/ThirdParty/OpenGL/CMakeLists.txt
index 229a923888aabf9f36c6ee8a7db0688c36e973c7..2f1a2c799ffb50f502cc7b5dc346ea2cc1cf33a4 100644
--- a/Modules/ThirdParty/OpenGL/CMakeLists.txt
+++ b/Modules/ThirdParty/OpenGL/CMakeLists.txt
@@ -2,6 +2,6 @@ project(OTBOpenGL)
 set(OTBOpenGL_THIRD_PARTY 1)
 
 set(OTBOpenGL_SYSTEM_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR})
-set(OTBOpenGL_LIBRARIES ${OPENGL_LIBRARY})
+set(OTBOpenGL_LIBRARIES ${OPENGL_LIBRARIES})
 
 otb_module_impl()
diff --git a/Modules/ThirdParty/OpenGL/otb-module-init.cmake b/Modules/ThirdParty/OpenGL/otb-module-init.cmake
index eef0d69146003ea621f05deccd1a455948e33709..486d0d1a9406dfd135e82db730cd35590a9667d6 100644
--- a/Modules/ThirdParty/OpenGL/otb-module-init.cmake
+++ b/Modules/ThirdParty/OpenGL/otb-module-init.cmake
@@ -46,15 +46,16 @@ else(APPLE)
   mark_as_advanced(OPENGL_LIBRARIES)
 endif(APPLE)
 
-
-if(NOT OPENGL_INCLUDE_DIR)
-  message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_INCLUDE_DIR")
-endif()
-
-if(NOT OPENGL_gl_LIBRARY)
-  message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_gl_LIBRARY")
-endif()
-
-if(NOT OPENGL_glu_LIBRARY)
-  message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_glu_LIBRARY")
+if(NOT WIN32)
+  if(NOT OPENGL_INCLUDE_DIR)
+    message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_INCLUDE_DIR")
+  endif()
+  
+  if(NOT OPENGL_gl_LIBRARY)
+    message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_gl_LIBRARY")
+  endif()
+  
+  if(NOT OPENGL_glu_LIBRARY)
+    message(FATAL_ERROR "Could not find OpenGL (missing: OPENGL_glu_LIBRARY")
+  endif()
 endif()