diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
index 9b01b577825..bdbacd32242 100644
--- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
+++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
@@ -19,7 +19,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt b/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt
index f40786eaea4..77bef204c98 100644
--- a/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt
+++ b/Boolean_set_operations_2/demo/Boolean_set_operations_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt b/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt
index 88983cdbd3b..d26d8f221a2 100644
--- a/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt
+++ b/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Envelope_3/demo/Envelope_3/CMakeLists.txt b/Envelope_3/demo/Envelope_3/CMakeLists.txt
index e532cf0718d..f81fc526974 100644
--- a/Envelope_3/demo/Envelope_3/CMakeLists.txt
+++ b/Envelope_3/demo/Envelope_3/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Generator/demo/Generator/CMakeLists.txt b/Generator/demo/Generator/CMakeLists.txt
index 06046923977..b3168291acd 100644
--- a/Generator/demo/Generator/CMakeLists.txt
+++ b/Generator/demo/Generator/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Largest_empty_rect_2/demo/Largest_empty_rect_2/CMakeLists.txt b/Largest_empty_rect_2/demo/Largest_empty_rect_2/CMakeLists.txt
index 1b3f663e30e..96aa5462a41 100644
--- a/Largest_empty_rect_2/demo/Largest_empty_rect_2/CMakeLists.txt
+++ b/Largest_empty_rect_2/demo/Largest_empty_rect_2/CMakeLists.txt
@@ -19,7 +19,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Min_circle_2/demo/Min_circle_2/CMakeLists.txt b/Min_circle_2/demo/Min_circle_2/CMakeLists.txt
index 0cf3f379526..94307dbc057 100644
--- a/Min_circle_2/demo/Min_circle_2/CMakeLists.txt
+++ b/Min_circle_2/demo/Min_circle_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt b/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt
index a1bdd7d8140..d07e6e7173d 100644
--- a/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt
+++ b/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt b/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt
index c7027f4eca5..22b645d4493 100644
--- a/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt
+++ b/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Nef_2/demo/Nef_2/CMakeLists.txt b/Nef_2/demo/Nef_2/CMakeLists.txt
index e7fcd32de12..a2e8b33b2fe 100644
--- a/Nef_2/demo/Nef_2/CMakeLists.txt
+++ b/Nef_2/demo/Nef_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Nef_S2/demo/Nef_S2/CMakeLists.txt b/Nef_S2/demo/Nef_S2/CMakeLists.txt
index 62f0a2f590f..e62791f5ea5 100644
--- a/Nef_S2/demo/Nef_S2/CMakeLists.txt
+++ b/Nef_S2/demo/Nef_S2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
 
 INCLUDE_DIRECTORIES ( BEFORE ./include )
diff --git a/Qt_widget/test/Qt_widget/CMakeLists.txt b/Qt_widget/test/Qt_widget/CMakeLists.txt
index 75275b491df..3397fa75bb5 100644
--- a/Qt_widget/test/Qt_widget/CMakeLists.txt
+++ b/Qt_widget/test/Qt_widget/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched QUIET)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
 
   # The executable itself.
diff --git a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/CMakeLists.txt b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/CMakeLists.txt
index 566615ff22b..80f1ab2616a 100644
--- a/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/CMakeLists.txt
+++ b/Segment_Delaunay_graph_2/demo/Segment_Delaunay_graph_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   include_directories (BEFORE ./include)
 
diff --git a/Snap_rounding_2/demo/Snap_rounding_2/CMakeLists.txt b/Snap_rounding_2/demo/Snap_rounding_2/CMakeLists.txt
index cb4a6859b2f..5ef935f29d6 100644
--- a/Snap_rounding_2/demo/Snap_rounding_2/CMakeLists.txt
+++ b/Snap_rounding_2/demo/Snap_rounding_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Spatial_searching/demo/Spatial_searching/CMakeLists.txt b/Spatial_searching/demo/Spatial_searching/CMakeLists.txt
index c3f19962221..2924f1f8261 100644
--- a/Spatial_searching/demo/Spatial_searching/CMakeLists.txt
+++ b/Spatial_searching/demo/Spatial_searching/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
index c5798037f28..b4121467c8f 100644
--- a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
+++ b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Stream_lines_2/demo/Stream_lines_2/CMakeLists.txt b/Stream_lines_2/demo/Stream_lines_2/CMakeLists.txt
index cefb1efeec7..290979aad08 100644
--- a/Stream_lines_2/demo/Stream_lines_2/CMakeLists.txt
+++ b/Stream_lines_2/demo/Stream_lines_2/CMakeLists.txt
@@ -20,7 +20,7 @@ find_package(Qt3-patched)
 
 find_package(OpenGL)
 
-if ( CGAL_FOUND AND QT3_FOUND AND OPENGL_FOUND)
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND AND OPENGL_FOUND)
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )
diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt
index 923e8fda2cd..52b2ccd6bfa 100644
--- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt
+++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt
@@ -20,7 +20,7 @@ find_package(Qt3-patched)
 # that it can be used together with FindQt4: all its variables are prefixed
 # by "QT3_" instead of "QT_".
 
-if ( CGAL_FOUND AND QT3_FOUND )
+if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   # use the Qt MOC preprocessor on classes that derives from QObject
   include( Qt3Macros-patched )