diff --git a/Installation/cmake/modules/FindLEDA.cmake b/Installation/cmake/modules/FindLEDA.cmake
index 9d2c37394dd..ce8aca2df2c 100644
--- a/Installation/cmake/modules/FindLEDA.cmake
+++ b/Installation/cmake/modules/FindLEDA.cmake
@@ -44,7 +44,15 @@ else()
     typed_cache_set( FILEPATH "The LEDA debug-mode libraries" LEDA_LIBRARY_DEBUG "$ENV{LEDA_LIBRARY_DEBUG}" )
   endif()
 
-  set(LEDA_LIBRARIES optimized ${LEDA_LIBRARY_RELEASE} debug ${LEDA_LIBRARY_DEBUG} )
+  if(LEDA_LIBRARY_RELEASE)
+    if(LEDA_LIBRARY_DEBUG)
+      set(LEDA_LIBRARIES_ optimized ${LEDA_LIBRARY_RELEASE} debug ${LEDA_LIBRARY_DEBUG})
+    else()
+      set(LEDA_LIBRARIES_ ${LEDA_LIBRARY_RELEASE})
+    endif()
+  endif()
+  
+  set(LEDA_LIBRARIES ${LEDA_LIBRARIES_} CACHE FILEPATH "The QGLViewer library")
 
 endif()
   
diff --git a/Installation/cmake/modules/FindQGLViewer.cmake b/Installation/cmake/modules/FindQGLViewer.cmake
index b6af7805961..83c00ec2e3c 100644
--- a/Installation/cmake/modules/FindQGLViewer.cmake
+++ b/Installation/cmake/modules/FindQGLViewer.cmake
@@ -36,13 +36,13 @@ find_library(QGLVIEWER_LIBRARY_DEBUG
 
 if(QGLVIEWER_LIBRARY_RELEASE)
   if(QGLVIEWER_LIBRARY_DEBUG)
-    set(QGLVIEWER_LIBRARIES optimized ${QGLVIEWER_LIBRARY_RELEASE} debug ${QGLVIEWER_LIBRARY_DEBUG})
-  else(QGLVIEWER_LIBRARY_DEBUG)
-    set(QGLVIEWER_LIBRARIES ${QGLVIEWER_LIBRARY_RELEASE})
-    endif(QGLVIEWER_LIBRARY_DEBUG)
-endif(QGLVIEWER_LIBRARY_RELEASE)
+    set(QGLVIEWER_LIBRARIES_ optimized ${QGLVIEWER_LIBRARY_RELEASE} debug ${QGLVIEWER_LIBRARY_DEBUG})
+  else()
+    set(QGLVIEWER_LIBRARIES_ ${QGLVIEWER_LIBRARY_RELEASE})
+  endif()
+endif()
 
-set(QGLVIEWER_LIBRARIES ${QGLVIEWER_LIBRARIES} CACHE FILEPATH "The QGLViewer library")
+set(QGLVIEWER_LIBRARIES ${QGLVIEWER_LIBRARIES_} CACHE FILEPATH "The QGLViewer library")
 
 IF(QGLVIEWER_INCLUDE_DIR AND QGLVIEWER_LIBRARIES)
    SET(QGLVIEWER_FOUND TRUE)