diff --git a/Core/src/CGALCore/CMakeLists.txt b/Core/src/CGALCore/CMakeLists.txt
index 5fde3d1ea50..eb6fb54c9c5 100644
--- a/Core/src/CGALCore/CMakeLists.txt
+++ b/Core/src/CGALCore/CMakeLists.txt
@@ -2,7 +2,7 @@ message(STATUS "Configure libCGALCore")
  
 use_lib( GMP "###")
 use_lib( MPFR "###")
-if (CGAL_USE_GMPXX) 
+if (FOUND_GMPXX) 
   use_lib( GMPXX "###")
 endif()
 
diff --git a/GraphicsView/src/CGALQt4/CMakeLists.txt b/GraphicsView/src/CGALQt4/CMakeLists.txt
index 82840166268..3692dc32467 100644
--- a/GraphicsView/src/CGALQt4/CMakeLists.txt
+++ b/GraphicsView/src/CGALQt4/CMakeLists.txt
@@ -62,7 +62,7 @@ if( QT4_FOUND )
 
     use_lib( GMP "###")
     use_lib( MPFR "###")
-    if (CGAL_USE_GMPXX) 
+    if (FOUND_GMPXX) 
       use_lib( GMPXX "###")
     endif()
 
diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt
index deed5f3032e..b85a992564c 100644
--- a/Installation/src/CGAL/CMakeLists.txt
+++ b/Installation/src/CGAL/CMakeLists.txt
@@ -4,7 +4,7 @@ collect_cgal_library(CGAL CGAL "")
 
 use_lib( GMP "###")
 use_lib( MPFR "###")
-if (CGAL_USE_GMPXX) 
+if (FOUND_GMPXX) 
   use_lib( GMPXX "###")
 endif()
 
diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt
index 33554d386f5..e11b055746e 100644
--- a/Installation/src/CMakeLists.txt
+++ b/Installation/src/CMakeLists.txt
@@ -36,7 +36,7 @@ endmacro()
 
 if(COMMAND unset)
   # Workaround: WITH_CGAL_Core can have been loaded from an old reference
-  # cache Then remove it from the cache, and re-add it only if CGAL_Core
+  # cache. Then remove it from the cache, and re-add it only if CGAL_Core
   # can be configured.
   unset(WITH_CGAL_Core CACHE)
 endif()
diff --git a/Qt_widget/src/CGALQt3/CMakeLists.txt b/Qt_widget/src/CGALQt3/CMakeLists.txt
index 461c234931d..5376a8d88b1 100644
--- a/Qt_widget/src/CGALQt3/CMakeLists.txt
+++ b/Qt_widget/src/CGALQt3/CMakeLists.txt
@@ -35,7 +35,7 @@ if( QT3_FOUND )
 
     use_lib( GMP "###")
     use_lib( MPFR "###")
-    if (CGAL_USE_GMPXX) 
+    if (FOUND_GMPXX) 
       use_lib( GMPXX "###")
     endif()