diff --git a/Alpha_shapes_2/demo/Alpha_shapes_2/CMakeLists.txt b/Alpha_shapes_2/demo/Alpha_shapes_2/CMakeLists.txt
index f7eb01f6cc4..69fc43bea67 100644
--- a/Alpha_shapes_2/demo/Alpha_shapes_2/CMakeLists.txt
+++ b/Alpha_shapes_2/demo/Alpha_shapes_2/CMakeLists.txt
@@ -35,6 +35,8 @@ if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND)
 		    Qt_widget_toolbar.cpp Qt_widget_toolbar.moc 
 		    Qt_widget_toolbar_layers.cpp Qt_widget_toolbar_layers.moc )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS alpha_shapes_2 )
+
   target_link_libraries( alpha_shapes_2 ${CGAL_LIBRARIES}  ${CGAL_3RD_PARTY_LIBRARIES})
 
 else()
diff --git a/Apollonius_graph_2/demo/Apollonius_graph_2/CMakeLists.txt b/Apollonius_graph_2/demo/Apollonius_graph_2/CMakeLists.txt
index 338eb835d1b..6504a2932a1 100644
--- a/Apollonius_graph_2/demo/Apollonius_graph_2/CMakeLists.txt
+++ b/Apollonius_graph_2/demo/Apollonius_graph_2/CMakeLists.txt
@@ -35,6 +35,7 @@ if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND )
   		  apollonius_graph_2.cpp apollonius_graph_2.moc 
   		  qt_file_toolbar.moc qt_layers_toolbar.moc edit_vertex_layer.moc )
   
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS apollonius_graph_2 )
   
   target_link_libraries( apollonius_graph_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
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 0a75290c3d9..39ba6eeaec5 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
@@ -37,6 +37,9 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 		    MyWindow_overlay.cpp
 		    qt_layer.cpp
 		    )
+
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS arrangement_2 )
+
   target_link_libraries( arrangement_2 ${CGAL_LIBRARIES}  ${CGAL_3RD_PARTY_LIBRARIES})
 
 else()
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 de10559fe35..939e3a505af 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
@@ -33,6 +33,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     Qt_widget_locate_layer.cpp
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS boolean_operations_2 )
+
   target_link_libraries( boolean_operations_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/CGALimageIO/demo/CGALimageIO/CMakeLists.txt b/CGALimageIO/demo/CGALimageIO/CMakeLists.txt
index 47d6387c966..adb54ec6d4e 100644
--- a/CGALimageIO/demo/CGALimageIO/CMakeLists.txt
+++ b/CGALimageIO/demo/CGALimageIO/CMakeLists.txt
@@ -37,6 +37,7 @@ if(VTK_FOUND)
   if(VTK_USE_QVTK)
     include_directories( ${VTK_QT_INCLUDE_DIR} )
     add_executable( image_to_vtk_viewer image_to_vtk_viewer.cpp )
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS image_to_vtk_viewer )
 
     target_link_libraries( image_to_vtk_viewer
       QVTK
diff --git a/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt b/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt
index 44fe9dcf643..d49b1707a03 100644
--- a/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt
+++ b/Convex_decomposition_3/demo/Convex_decomposition_3/CMakeLists.txt
@@ -25,6 +25,8 @@ if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND)
   add_executable  ( convex_decomposition_3
                     convex_decomposition_3.cpp )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS convex_decomposition_3 )
+
   target_link_libraries( convex_decomposition_3 ${CGAL_LIBRARIES}  ${CGAL_3RD_PARTY_LIBRARIES})
 
 else()
diff --git a/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt b/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt
index 96eafd62b67..7a579bde491 100644
--- a/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt
+++ b/Convex_hull_2/demo/Convex_hull_2/CMakeLists.txt
@@ -34,6 +34,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     Qt_widget_move_list_point.cpp Qt_widget_move_list_point.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS convex_hull_2 )
+
   target_link_libraries( convex_hull_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/Envelope_3/demo/Envelope_3/CMakeLists.txt b/Envelope_3/demo/Envelope_3/CMakeLists.txt
index 5173cffa4dc..82be446a298 100644
--- a/Envelope_3/demo/Envelope_3/CMakeLists.txt
+++ b/Envelope_3/demo/Envelope_3/CMakeLists.txt
@@ -30,6 +30,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     envelope_3.cpp envelope_3.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS envelope_3 )
+
   target_link_libraries( envelope_3  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/Generator/demo/Generator/CMakeLists.txt b/Generator/demo/Generator/CMakeLists.txt
index 170d4cf9568..4545f972c88 100644
--- a/Generator/demo/Generator/CMakeLists.txt
+++ b/Generator/demo/Generator/CMakeLists.txt
@@ -30,6 +30,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     generator.cpp generator.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS generator )
+
   target_link_libraries( generator  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt b/GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt
index 265a0a7308f..4c2f5942ce6 100644
--- a/GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt
+++ b/GraphicsView/demo/Alpha_shapes_3/CMakeLists.txt
@@ -39,6 +39,9 @@ if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_
   qt4_automoc( MainWindow.cpp Viewer.cpp)
 
   add_executable  ( Alpha_shape_3 Alpha_shape_3.cpp MainWindow.cpp Viewer.cpp ${uis}  ${RESOURCE_FILES} )
+
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS Alpha_shape_3 )
+
   target_link_libraries( Alpha_shape_3 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
   target_link_libraries( Alpha_shape_3 ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} )
   target_link_libraries( Alpha_shape_3 ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
diff --git a/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt b/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
index e916a712ae3..a5e86ec5eff 100644
--- a/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
+++ b/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
@@ -38,6 +38,8 @@ if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND )
   # The executable itself.
   add_executable  ( Circular_kernel_2 Circular_kernel_2.cpp Circular_kernel_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS Circular_kernel_2 )
+
   # Link with Qt libraries
   target_link_libraries( Circular_kernel_2 ${QT_LIBRARIES} )
   # Link with CGAL
diff --git a/GraphicsView/demo/GraphicsView/CMakeLists.txt b/GraphicsView/demo/GraphicsView/CMakeLists.txt
index bbb02330816..35664ec8528 100644
--- a/GraphicsView/demo/GraphicsView/CMakeLists.txt
+++ b/GraphicsView/demo/GraphicsView/CMakeLists.txt
@@ -29,6 +29,7 @@ if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND )
 
   add_executable  ( min min.cpp )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS min )
 
   # Link with Qt libraries
   target_link_libraries( min ${QT_LIBRARIES} )
diff --git a/GraphicsView/demo/Polygon/CMakeLists.txt b/GraphicsView/demo/Polygon/CMakeLists.txt
index fcb63433f9c..0fca5624fc2 100644
--- a/GraphicsView/demo/Polygon/CMakeLists.txt
+++ b/GraphicsView/demo/Polygon/CMakeLists.txt
@@ -42,6 +42,8 @@ if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND CGAL_Core_FOUND AND QT4_FOUND )
   # The executable itself.
   add_executable  ( Polygon_2 Polygon_2.cpp Polygon_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS Polygon_2 )
+
   # Link with Qt libraries
   target_link_libraries( Polygon_2 ${QT_LIBRARIES} )
   # And with CGAL libraries
diff --git a/GraphicsView/demo/Triangulation_2/CMakeLists.txt b/GraphicsView/demo/Triangulation_2/CMakeLists.txt
index b7bef6dcf2c..5c21efbb435 100644
--- a/GraphicsView/demo/Triangulation_2/CMakeLists.txt
+++ b/GraphicsView/demo/Triangulation_2/CMakeLists.txt
@@ -45,6 +45,8 @@ qt4_generate_moc( Constrained_Delaunay_triangulation_2.cpp Constrained_Delaunay_
 # The executable itself.
 add_executable  ( Constrained_Delaunay_triangulation_2 Constrained_Delaunay_triangulation_2.cpp Constrained_Delaunay_triangulation_2.moc ${CDT_UI_FILES} ${CDT_RESOURCE_FILES} )
 
+add_to_cached_list( CGAL_EXECUTABLE_TARGETS Constrained_Delaunay_triangulation_2 )
+
 # Link with Qt libraries
 target_link_libraries( Constrained_Delaunay_triangulation_2 ${QT_LIBRARIES} )
 # Link with CGAL
@@ -65,6 +67,8 @@ qt4_generate_moc( Delaunay_triangulation_2.cpp Delaunay_triangulation_2.moc )
 # The executable itself.
 add_executable  ( Delaunay_triangulation_2 Delaunay_triangulation_2.cpp Delaunay_triangulation_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
 
+add_to_cached_list( CGAL_EXECUTABLE_TARGETS Circular_kernel_3 )
+
 # Link with Qt libraries
 target_link_libraries( Delaunay_triangulation_2 ${QT_LIBRARIES} )
 # Link with CGAL
@@ -85,6 +89,8 @@ qt4_generate_moc( Regular_triangulation_2.cpp Regular_triangulation_2.moc )
 # The executable itself.
 add_executable  ( Regular_triangulation_2 Regular_triangulation_2.cpp Regular_triangulation_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
 
+add_to_cached_list( CGAL_EXECUTABLE_TARGETS Circular_kernel_3 )
+
 # Link with Qt libraries
 target_link_libraries( Regular_triangulation_2 ${QT_LIBRARIES} )
 # Link with CGAL
diff --git a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
index 9a1a93dffd9..9bc3fa2532e 100644
--- a/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
+++ b/Kinetic_data_structures/demo/Kinetic_data_structures/CMakeLists.txt
@@ -55,7 +55,8 @@ if ( CGAL_FOUND )
     # Demo KDS_generate_data
     add_executable  (KDS_generate_data KDS_generate_data.cpp)
     target_link_libraries(KDS_generate_data ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
-  
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS KDS_generate_data )
+
     # Demo KDS_Delaunay_triangulation_stable_subset_2
     add_executable  (KDS_Delaunay_triangulation_stable_subset_2 KDS_Delaunay_triangulation_stable_subset_2.cpp)
     target_link_libraries(KDS_Delaunay_triangulation_stable_subset_2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
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 1cbf59eb29b..7aff0a2aaec 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
@@ -35,6 +35,7 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     Qt_widget_move_list_point.cpp Qt_widget_move_list_point.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS largest_empty_rect_2 )
   target_link_libraries( largest_empty_rect_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/Matrix_search/demo/Matrix_search/CMakeLists.txt b/Matrix_search/demo/Matrix_search/CMakeLists.txt
index 77e0a620ac2..4f1d592256a 100644
--- a/Matrix_search/demo/Matrix_search/CMakeLists.txt
+++ b/Matrix_search/demo/Matrix_search/CMakeLists.txt
@@ -45,6 +45,9 @@ if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND)
   target_link_libraries( max_k-gon  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
   target_link_libraries( rectangular_p_center_2_demo  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS max_k-gon )
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS rectangular_p_center_2_demo )
+
 else()
 
   message(STATUS "NOTICE: This demo requires CGAL and Qt3, and will not be compiled.")
diff --git a/Mesh_2/demo/Mesh_2/CMakeLists.txt b/Mesh_2/demo/Mesh_2/CMakeLists.txt
index cc732e45f73..9442d774347 100644
--- a/Mesh_2/demo/Mesh_2/CMakeLists.txt
+++ b/Mesh_2/demo/Mesh_2/CMakeLists.txt
@@ -40,10 +40,12 @@ if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND)
   # conform target
   add_executable  (conform conform.cpp)
   target_link_libraries(conform ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS conform )
 
   # mesh target
   add_executable  (mesh mesh.cpp)
   target_link_libraries(mesh ${QT3_LIBRARIES} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS mesh )
 
 else()
 
diff --git a/Min_circle_2/demo/Min_circle_2/CMakeLists.txt b/Min_circle_2/demo/Min_circle_2/CMakeLists.txt
index d7a01058788..94d5da39cbf 100644
--- a/Min_circle_2/demo/Min_circle_2/CMakeLists.txt
+++ b/Min_circle_2/demo/Min_circle_2/CMakeLists.txt
@@ -34,6 +34,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     Qt_widget_move_list_point.cpp Qt_widget_move_list_point.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS min_circle_2_demo )
+
   target_link_libraries( min_circle_2_demo  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt b/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt
index 0b13bfcca8a..6e527e691d9 100644
--- a/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt
+++ b/Min_ellipse_2/demo/Min_ellipse_2/CMakeLists.txt
@@ -34,6 +34,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     Qt_widget_move_list_point.cpp Qt_widget_move_list_point.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS min_ellipse_2_demo )
+
   target_link_libraries( min_ellipse_2_demo  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt b/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt
index b4c6513d8f2..f73e43b813b 100644
--- a/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt
+++ b/Min_quadrilateral_2/demo/Min_quadrilateral_2/CMakeLists.txt
@@ -36,6 +36,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     Qt_widget_move_list_point.cpp Qt_widget_move_list_point.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS min_quadrilateral_2 )
+
   target_link_libraries( min_quadrilateral_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/Minkowski_sum_3/demo/Minkowski_sum_3/CMakeLists.txt b/Minkowski_sum_3/demo/Minkowski_sum_3/CMakeLists.txt
index 93b0b1b9de2..c832905bf7c 100644
--- a/Minkowski_sum_3/demo/Minkowski_sum_3/CMakeLists.txt
+++ b/Minkowski_sum_3/demo/Minkowski_sum_3/CMakeLists.txt
@@ -25,6 +25,8 @@ if ( CGAL_FOUND AND QT3_FOUND AND CGAL_Qt3_FOUND)
   add_executable  ( minkowski_sum_3
                     minkowski_sum_3.cpp )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS minkowski_sum_3 )
+
   target_link_libraries( minkowski_sum_3 ${CGAL_LIBRARIES}  ${CGAL_3RD_PARTY_LIBRARIES})
 
 else()
diff --git a/Nef_2/demo/Nef_2/CMakeLists.txt b/Nef_2/demo/Nef_2/CMakeLists.txt
index 9ef47715b26..327c7282afa 100644
--- a/Nef_2/demo/Nef_2/CMakeLists.txt
+++ b/Nef_2/demo/Nef_2/CMakeLists.txt
@@ -31,6 +31,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
                     nef_2.cpp nef_2.moc
 		    Qt_widget_toolbar.cpp Qt_widget_toolbar.moc )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS nef_2 )
+
   target_link_libraries( nef_2 ${CGAL_LIBRARIES}  ${CGAL_3RD_PARTY_LIBRARIES})
 
 else()
diff --git a/Nef_S2/demo/Nef_S2/CMakeLists.txt b/Nef_S2/demo/Nef_S2/CMakeLists.txt
index e62791f5ea5..f6bc92620d5 100644
--- a/Nef_S2/demo/Nef_S2/CMakeLists.txt
+++ b/Nef_S2/demo/Nef_S2/CMakeLists.txt
@@ -27,6 +27,8 @@ INCLUDE_DIRECTORIES ( BEFORE ./include )
   add_executable  ( nef_S2
                     nef_S2.cpp )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS nef_S2 )
+
   target_link_libraries( nef_S2 ${CGAL_LIBRARIES}  ${CGAL_3RD_PARTY_LIBRARIES})
 
 else()
diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt
index 12c5dafc9ef..8ddd55c012b 100644
--- a/Polyhedron/demo/Polyhedron/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt
@@ -113,6 +113,8 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
   # Link with libQGLViewer, OpenGL
   target_link_libraries( Polyhedron_3 ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS Polyhedron_3 )
+
   if(TAUCS_FOUND)
     # Link with TAUCS
     target_link_libraries(Polyhedron_3 ${TAUCS_LIBRARIES})
diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt
index d70add0e42c..f84b4df44ef 100644
--- a/Ridges_3/examples/Ridges_3/CMakeLists.txt
+++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt
@@ -37,6 +37,7 @@ if ( CGAL_FOUND )
     endif()
 
     add_executable(Compute_Ridges_Umbilics Compute_Ridges_Umbilics.cpp PolyhedralSurf.cpp)
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS Compute_Ridges_Umbilics )
     target_link_libraries(Compute_Ridges_Umbilics ${CGAL_LIBRARIES})
 
   else(LAPACK_FOUND)
diff --git a/Robustness/demo/Robustness/CMakeLists.txt b/Robustness/demo/Robustness/CMakeLists.txt
index b9e14d28d19..6c8706bbcf5 100644
--- a/Robustness/demo/Robustness/CMakeLists.txt
+++ b/Robustness/demo/Robustness/CMakeLists.txt
@@ -30,6 +30,8 @@ if ( CGAL_Qt3_FOUND AND QT3_FOUND )
     robustness.cpp robustness.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS robustness )
+
   target_link_libraries( robustness  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
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 89ac68fcbe0..dc6d49feb59 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
@@ -42,6 +42,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
 
   target_link_libraries( segment_delaunay_graph_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS polygon_delaunay_graph_2 )
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS segment_delaunay_graph_2 )
 else()
 
   message(STATUS "NOTICE: This demo requires CGAL,, Core, and Qt3, and will not be compiled.")
diff --git a/Snap_rounding_2/demo/Snap_rounding_2/CMakeLists.txt b/Snap_rounding_2/demo/Snap_rounding_2/CMakeLists.txt
index e9173c69f7d..9c64093cb67 100644
--- a/Snap_rounding_2/demo/Snap_rounding_2/CMakeLists.txt
+++ b/Snap_rounding_2/demo/Snap_rounding_2/CMakeLists.txt
@@ -32,6 +32,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     snap_rounding_2_toolbar.cpp snap_rounding_2_toolbar.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS snap_rounding_2 )
+
   target_link_libraries( snap_rounding_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/Spatial_searching/demo/Spatial_searching/CMakeLists.txt b/Spatial_searching/demo/Spatial_searching/CMakeLists.txt
index 3bb9578257e..6d6f15c6f00 100644
--- a/Spatial_searching/demo/Spatial_searching/CMakeLists.txt
+++ b/Spatial_searching/demo/Spatial_searching/CMakeLists.txt
@@ -34,6 +34,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     Qt_widget_move_list_point.cpp Qt_widget_move_list_point.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS spatial_searching )
+
   target_link_libraries( spatial_searching  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()
diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
index 94b8b191ae9..d2a791fbc4a 100644
--- a/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
+++ b/Straight_skeleton_2/demo/Straight_skeleton_2/CMakeLists.txt
@@ -34,6 +34,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     straight_skeleton_2_toolbar_layers.cpp straight_skeleton_2_toolbar_layers.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS straight_skeleton_2 )
+
   target_link_libraries( straight_skeleton_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${QT3_LIBRARIES} )
   
 message( STATUS "QT3_LIBRARIES=${QT3_LIBRARIES}" )   
diff --git a/Stream_lines_2/demo/Stream_lines_2/CMakeLists.txt b/Stream_lines_2/demo/Stream_lines_2/CMakeLists.txt
index d924a62cc94..f927f3e193f 100644
--- a/Stream_lines_2/demo/Stream_lines_2/CMakeLists.txt
+++ b/Stream_lines_2/demo/Stream_lines_2/CMakeLists.txt
@@ -32,6 +32,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND AND OPENGL_FOUND)
   add_executable  ( streamlines
                     streamlines.cpp streamlines.moc )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS streamlines )
+
   target_link_libraries( streamlines ${CGAL_LIBRARIES}  ${CGAL_3RD_PARTY_LIBRARIES} ${OPENGL_LIBRARIES})
 
 else()
diff --git a/Surface_mesher/demo/Surface_mesher/CMakeLists.txt b/Surface_mesher/demo/Surface_mesher/CMakeLists.txt
index feafa7134f2..5dc88d41ced 100644
--- a/Surface_mesher/demo/Surface_mesher/CMakeLists.txt
+++ b/Surface_mesher/demo/Surface_mesher/CMakeLists.txt
@@ -90,6 +90,8 @@ if ( CGAL_FOUND AND CGAL_Qt4_FOUND)
 
     add_executable  ( ${prj}  ${sources} ${uis} ${qrc_sources} )
     
+    add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${prj} )
+
     # Link the executable to CGAL and third-party libraries
     target_link_libraries( ${prj} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
     
diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt
index 1d6024b9ee2..5a2893dfd94 100644
--- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt
+++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/CMakeLists.txt
@@ -35,6 +35,8 @@ if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
     qt_file_toolbar.moc qt_layers_toolbar.moc my_window.moc
     )
 
+  add_to_cached_list( CGAL_EXECUTABLE_TARGETS voronoi_diagram_2 )
+
   target_link_libraries( voronoi_diagram_2  ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )
 
 else()