diff --git a/AABB_tree/benchmark/AABB_tree/CMakeLists.txt b/AABB_tree/benchmark/AABB_tree/CMakeLists.txt
index 162d8cd9a15..3a314302b01 100644
--- a/AABB_tree/benchmark/AABB_tree/CMakeLists.txt
+++ b/AABB_tree/benchmark/AABB_tree/CMakeLists.txt
@@ -12,6 +12,8 @@ find_package(benchmark)
 if (benchmark_FOUND)
   create_single_source_cgal_program("tree_creation.cpp")
   target_link_libraries(tree_creation benchmark::benchmark)
+else()
+  message(STATUS "NOTICE: The benchmark 'tree_creation.cpp' requires the Google benchmark library, and will not be compiled.")
 endif()
 create_single_source_cgal_program("test.cpp")
 create_single_source_cgal_program("tree_construction.cpp")
diff --git a/AABB_tree/demo/AABB_tree/CMakeLists.txt b/AABB_tree/demo/AABB_tree/CMakeLists.txt
index c8a7e6dffce..c777eba1798 100644
--- a/AABB_tree/demo/AABB_tree/CMakeLists.txt
+++ b/AABB_tree/demo/AABB_tree/CMakeLists.txt
@@ -73,9 +73,6 @@ else(CGAL_Qt5_FOUND AND Qt5_FOUND)
     set(AABB_MISSING_DEPS "Qt5, ${AABB_MISSING_DEPS}")
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This demo requires ${AABB_MISSING_DEPS}and will not be compiled."
-  )
+  message("NOTICE: This demo requires ${AABB_MISSING_DEPS}, and will not be compiled.")
 
 endif(CGAL_Qt5_FOUND AND Qt5_FOUND)
diff --git a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt
index de5a1876957..841c0b28d95 100644
--- a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt
+++ b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt
@@ -14,5 +14,5 @@ if(MPFI_FOUND AND NOT CGAL_DISABLE_GMP)
   create_single_source_cgal_program("Sign_at_1.cpp")
   create_single_source_cgal_program("Solve_1.cpp")
 else()
-    message(STATUS "This program requires the CGAL, CGAL_Core and MPFI libraries, and will not be compiled.")
+  message("NOTICE: This project requires the MPFI library and GMP support, and will not be compiled.")
 endif()
diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
index 850c3396759..1a16e619149 100644
--- a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
+++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
@@ -52,14 +52,13 @@ if(NOT CGAL_DISABLE_GMP)
   create_single_source_cgal_program("Curve_analysis_2.cpp")
   create_single_source_cgal_program("Curve_pair_analysis_2.cpp")
   create_single_source_cgal_program("Real_embeddable_traits_extension.cpp")
+
   if(RS_FOUND)
     create_single_source_cgal_program("Algebraic_kernel_rs_gmpq_d_1.cpp")
     create_single_source_cgal_program("Algebraic_kernel_rs_gmpz_d_1.cpp")
   else()
-    message(
-      STATUS
-        "NOTICE: Some tests require the RS library, and will not be compiled.")
+    message(STATUS "NOTICE: Some tests require the RS library, and will not be compiled.")
   endif()
 else()
-  message(STATUS "NOTICE: Some tests require the CGAL_Core library, and will not be compiled.")
+  message(STATUS "NOTICE: Some tests require GMP support, and will not be compiled.")
 endif()
diff --git a/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt b/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
index dde215bbeee..27ebe2ddbf6 100644
--- a/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
+++ b/Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
@@ -47,8 +47,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL, and Qt5, and will not be compiled."
-  )
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
index 3c1e32fa19f..cb56ac2bc55 100644
--- a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
+++ b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
@@ -27,16 +27,13 @@ if(GMP_FOUND)
     # version needs GMP>=4.2, so we require this dependency only here and
     # not in FindMPFI.cmake
     if(_IS_GMP_VERSION_TO_LOW)
-      message(
-        STATUS
-          "MPFI tests need GMP>=4.2, some of the tests will not be compiled")
+      message(STATUS "NOTICE: MPFI tests need GMP>=4.2, some of the tests will not be compiled")
     else(_IS_GMP_VERSION_TO_LOW)
       include(${MPFI_USE_FILE})
       create_single_source_cgal_program("GMP_arithmetic_kernel.cpp")
     endif(_IS_GMP_VERSION_TO_LOW)
   else(MPFI_FOUND)
-    message(
-      STATUS "MPFI is not present, some of the tests will not be compiled.")
+    message(STATUS "NOTICE: MPFI is not present, some of the tests will not be compiled.")
   endif(MPFI_FOUND)
 
   create_single_source_cgal_program("Arithmetic_kernel.cpp")
@@ -46,7 +43,6 @@ if(GMP_FOUND)
 
 else()
 
-  message(
-    STATUS "This program requires the CGAL library, and will not be compiled.")
+  message("NOTICE: This project requires GMP support, and will not be compiled.")
 
 endif()
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 e91295a5d90..35940772325 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
@@ -133,6 +133,5 @@ else()
   if(NOT Qt5_FOUND)
     set(MISSING_DEPS "Qt5, ${MISSING_DEPS}")
   endif()
-  message(STATUS
-          "NOTICE: This demo requires ${MISSING_DEPS} and will not be compiled.")
+  message("NOTICE: This demo requires ${MISSING_DEPS} and will not be compiled.")
 endif()
diff --git a/BGL/examples/BGL_OpenMesh/CMakeLists.txt b/BGL/examples/BGL_OpenMesh/CMakeLists.txt
index ca213799b53..19ade1e416b 100644
--- a/BGL/examples/BGL_OpenMesh/CMakeLists.txt
+++ b/BGL/examples/BGL_OpenMesh/CMakeLists.txt
@@ -41,4 +41,6 @@ endif()
 if(OpenMesh_FOUND)
   create_single_source_cgal_program("TriMesh.cpp")
   target_link_libraries(TriMesh PRIVATE ${OPENMESH_LIBRARIES})
+else()
+  message("NOTICE: This project requires OpenMesh and will not be compiled.")
 endif()
diff --git a/BGL/examples/BGL_polyhedron_3/CMakeLists.txt b/BGL/examples/BGL_polyhedron_3/CMakeLists.txt
index 51c84c35aed..f898cb277fa 100644
--- a/BGL/examples/BGL_polyhedron_3/CMakeLists.txt
+++ b/BGL/examples/BGL_polyhedron_3/CMakeLists.txt
@@ -41,7 +41,7 @@ if(OpenMesh_FOUND)
   target_link_libraries( copy_polyhedron PRIVATE ${OPENMESH_LIBRARIES} )
   target_compile_definitions( copy_polyhedron PRIVATE -DCGAL_USE_OPENMESH )
 else()
-  message(STATUS "Examples that use OpenMesh will not be compiled.")
+  message(STATUS "NOTICE: The example 'copy_polyhedron' requires OpenMesh, and will not be compiled.")
 endif()
 
 find_package( METIS )
@@ -50,5 +50,5 @@ if( TARGET CGAL::METIS_support )
   create_single_source_cgal_program( "polyhedron_partition.cpp" )
   target_link_libraries( polyhedron_partition PUBLIC CGAL::METIS_support)
 else()
-  message( STATUS "Examples that use the METIS library will not be compiled." )
+  message(STATUS "NOTICE: The example 'polyhedron_partition' requires the METIS library, and will not be compiled.")
 endif()
diff --git a/BGL/examples/BGL_surface_mesh/CMakeLists.txt b/BGL/examples/BGL_surface_mesh/CMakeLists.txt
index b96ec0308e1..e53938277bb 100644
--- a/BGL/examples/BGL_surface_mesh/CMakeLists.txt
+++ b/BGL/examples/BGL_surface_mesh/CMakeLists.txt
@@ -18,5 +18,5 @@ if( TARGET CGAL::METIS_support )
   create_single_source_cgal_program( "surface_mesh_partition.cpp" )
   target_link_libraries( surface_mesh_partition PUBLIC CGAL::METIS_support )
 else()
-  message(STATUS "Examples that use the METIS library will not be compiled.")
+  message(STATUS "NOTICE: Examples that use the METIS library will not be compiled.")
 endif()
diff --git a/BGL/test/BGL/CMakeLists.txt b/BGL/test/BGL/CMakeLists.txt
index 8a06a97cb2a..f695c456d7d 100644
--- a/BGL/test/BGL/CMakeLists.txt
+++ b/BGL/test/BGL/CMakeLists.txt
@@ -118,5 +118,5 @@ if(3MF_LIBRARIES AND 3MF_INCLUDE_DIR  AND EXISTS "${3MF_INCLUDE_DIR}/Model/COM/N
   target_link_libraries(test_3mf_to_sm PRIVATE ${3MF_LIBRARIES})
   target_compile_definitions(test_3mf_to_sm PRIVATE -DCGAL_LINKED_WITH_3MF)
 else()
-  message(STATUS "NOTICE : This program requires the lib3MF library, and will not be compiled.")
+  message(STATUS "NOTICE: The test 'test_3mf_to_sm' requires the lib3MF library, and will not be compiled.")
 endif()
diff --git a/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt
index f8b37af9c4b..9aa881ce12f 100644
--- a/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt
+++ b/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt
@@ -19,12 +19,10 @@ create_single_source_cgal_program("benchmark_mv_34_vertices.cpp")
 find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(TARGET CGAL::Eigen3_support)
-
   create_single_source_cgal_program("benchmark_hm_4_vertices.cpp")
   target_link_libraries(benchmark_hm_4_vertices PUBLIC CGAL::Eigen3_support)
   create_single_source_cgal_program("benchmark_hm_n_vertices.cpp")
   target_link_libraries(benchmark_hm_n_vertices PUBLIC CGAL::Eigen3_support)
-
 else()
-  message(NOTICE "Several coordinates require the Eigen library, and will not be compiled.")
+  message(STATUS "NOTICE: Several benchmarks require the Eigen library, and will not be compiled.")
 endif()
diff --git a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
index 547eb21203d..95f907fbb10 100644
--- a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
+++ b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
@@ -20,14 +20,12 @@ create_single_source_cgal_program("deprecated_coordinates.cpp")
 find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(TARGET CGAL::Eigen3_support)
-
   create_single_source_cgal_program("affine_coordinates.cpp")
   target_link_libraries(affine_coordinates PUBLIC CGAL::Eigen3_support)
   create_single_source_cgal_program("harmonic_coordinates.cpp")
   target_link_libraries(harmonic_coordinates PUBLIC CGAL::Eigen3_support)
   create_single_source_cgal_program("shape_deformation.cpp")
   target_link_libraries(shape_deformation PUBLIC CGAL::Eigen3_support)
-
 else()
-  message(NOTICE "Several coordinates require the Eigen library, and will not be compiled.")
+  message(STATUS "NOTICE: Several examples require the Eigen library, and will not be compiled.")
 endif()
diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
index 41c76ac2db2..e147d8f5dae 100644
--- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
+++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
@@ -56,5 +56,5 @@ if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("test_bc_all_coordinates.cpp")
   target_link_libraries(test_bc_all_coordinates PUBLIC CGAL::Eigen3_support)
 else()
-  message(NOTICE "Several coordinates require the Eigen library, and will not be compiled.")
+  message(STATUS "NOTICE: Several tests require the Eigen library, and will not be compiled.")
 endif()
diff --git a/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt b/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt
index 73a02373208..f24ead2e8bd 100644
--- a/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt
+++ b/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt
@@ -18,8 +18,5 @@ endforeach()
 if(CGAL_Qt5_FOUND)
   target_link_libraries(draw_polygon_set PUBLIC CGAL::CGAL_Basic_viewer)
 else()
-  message(
-    STATUS
-      "NOTICE: The example draw_polygon_set requires Qt and drawing will be disabled."
-  )
+  message(STATUS "NOTICE: The example 'draw_polygon_set' requires Qt and drawing will be disabled.")
 endif()
diff --git a/Box_intersection_d/test/Box_intersection_d/CMakeLists.txt b/Box_intersection_d/test/Box_intersection_d/CMakeLists.txt
index 1d331fd485f..81d14bb28d7 100644
--- a/Box_intersection_d/test/Box_intersection_d/CMakeLists.txt
+++ b/Box_intersection_d/test/Box_intersection_d/CMakeLists.txt
@@ -18,6 +18,5 @@ create_single_source_cgal_program("test_Has_member_report.cpp")
 if(TARGET CGAL::TBB_support)
   target_link_libraries(test_box_grid PUBLIC CGAL::TBB_support)
 else()
-  message(
-    STATUS "NOTICE: Intel TBB was not found. Sequential code will be used.")
+  message(STATUS "NOTICE: Intel TBB was not found. Sequential code will be used.")
 endif()
diff --git a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
index 8e2edfb8f13..81349809977 100644
--- a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
+++ b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
@@ -9,8 +9,5 @@ find_package(CGAL REQUIRED COMPONENTS ImageIO)
 if(WITH_CGAL_ImageIO)
   create_single_source_cgal_program("test_trilinear_interpolation.cpp")
 else()
-  message(
-    STATUS
-      "NOTICE: Some tests require the CGAL_ImageIO library, and will not be compiled."
-  )
+  message("NOTICE: This project requires the CGAL_ImageIO library, and will not be compiled.")
 endif()
diff --git a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
index 1a6c6591822..8944aae476d 100644
--- a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
+++ b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
@@ -25,17 +25,14 @@ include(${CGAL_USE_FILE})
 find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS
-      "NOTICE: This project requires the Eigen library, and will not be compiled."
-  )
+  message("NOTICE: This project requires the Eigen library, and will not be compiled.")
   return()
 endif()
 
 find_package(IPE 7)
 if(IPE_FOUND)
-  if ( NOT ${IPE_VERSION} EQUAL "7")
-    message("-- Error: ${IPE_VERSION} is not a supported version of IPE (only 7 is).")
+  if(NOT ${IPE_VERSION} EQUAL "7")
+    message("NOTICE: ${IPE_VERSION} is not a supported version of IPE (only 7 is).")
     set(IPE_FOUND FALSE)
   endif()
 endif()
@@ -117,5 +114,5 @@ if(IPE_FOUND AND IPE_VERSION)
   cgal_add_compilation_test(simple_triangulation)
 
 else()
-  message(STATUS "NOTICE: This program requires the Ipe include files and library, and will not be compiled.")
+  message("NOTICE: This project requires the Ipe include files and library, and will not be compiled.")
 endif()
diff --git a/Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt b/Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
index 651458bf5c0..54c3be3aba4 100644
--- a/Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
+++ b/Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt
@@ -33,8 +33,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL, and Qt5, and will not be compiled."
-  )
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/Classification/examples/Classification/CMakeLists.txt b/Classification/examples/Classification/CMakeLists.txt
index aef4c8b5952..2af17775b7c 100644
--- a/Classification/examples/Classification/CMakeLists.txt
+++ b/Classification/examples/Classification/CMakeLists.txt
@@ -23,17 +23,12 @@ include(CGAL_Boost_serialization_support)
 include(CGAL_Boost_iostreams_support)
 
 if(NOT TARGET CGAL::Boost_serialization_support)
-  message(
-    STATUS
-      "NOTICE: This project requires Boost Serialization, and will not be compiled."
-  )
+  message("NOTICE: This project requires Boost Serialization, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
+
 if(NOT TARGET CGAL::Boost_iostreams_support)
-  message(
-    STATUS
-      "NOTICE: This project requires Boost IO Streams, and will not be compiled."
-  )
+  message("NOTICE: This project requires Boost IO Streams, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
 
@@ -49,8 +44,7 @@ endif()
 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS "This project requires the Eigen library, and will not be compiled.")
+  message("NOTICE: This project requires the Eigen library, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
 
diff --git a/Classification/test/Classification/CMakeLists.txt b/Classification/test/Classification/CMakeLists.txt
index 8e6794dae27..63ba324644c 100644
--- a/Classification/test/Classification/CMakeLists.txt
+++ b/Classification/test/Classification/CMakeLists.txt
@@ -23,26 +23,19 @@ include(CGAL_Boost_serialization_support)
 include(CGAL_Boost_iostreams_support)
 
 if(NOT TARGET CGAL::Boost_serialization_support)
-  message(
-    STATUS
-      "NOTICE: This project requires Boost Serialization, and will not be compiled."
-  )
+  message("NOTICE: This project requires Boost Serialization, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
 
 if(NOT TARGET CGAL::Boost_iostreams_support)
-  message(
-    STATUS
-      "NOTICE: This project requires Boost IO Streams, and will not be compiled."
-  )
+  message("NOTICE: This project requires Boost IO Streams, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
 
 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS "This project requires the Eigen library, and will not be compiled.")
+  message("NOTICE: This project requires the Eigen library, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
 
diff --git a/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt b/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt
index 608e8c0a839..06592fa2548 100644
--- a/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt
+++ b/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt
@@ -21,10 +21,5 @@ if(CGAL_Core_FOUND OR LEDA_FOUND)
     create_single_source_cgal_program("${cppfile}")
   endforeach()
 else()
-
-  message(
-    STATUS
-      "This program requires the CGAL_Core library (or LEDA), and will not be compiled."
-  )
-
+  message("NOTICE: This program requires the CGAL_Core library (or LEDA), and will not be compiled.")
 endif()
diff --git a/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt b/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt
index a9ff9378850..097eb885bd6 100644
--- a/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt
+++ b/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt
@@ -52,4 +52,6 @@ if(OpenMesh_FOUND)
 
   target_link_libraries(quickhull_OM_3 PRIVATE ${OPENMESH_LIBRARIES})
   target_link_libraries(dynamic_hull_OM_3 PRIVATE ${OPENMESH_LIBRARIES})
+else()
+  message(STATUS "NOTICE: Examples that use OpenMesh will not be compiled.")
 endif()
diff --git a/GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt b/GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
index 5dfc09dac1f..0b8741ef5d2 100644
--- a/GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
+++ b/GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
@@ -47,8 +47,5 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(Alpha_shapes_2)
 else()
-
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
-
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 endif()
diff --git a/GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt b/GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
index 3433ff6e691..ab0f43011f9 100644
--- a/GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
+++ b/GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
@@ -45,10 +45,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(Apollonius_graph_2)
-
 else()
-
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
-
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 endif()
diff --git a/GraphicsView/demo/Bounding_volumes/CMakeLists.txt b/GraphicsView/demo/Bounding_volumes/CMakeLists.txt
index 311b31d8e25..8eba3017587 100644
--- a/GraphicsView/demo/Bounding_volumes/CMakeLists.txt
+++ b/GraphicsView/demo/Bounding_volumes/CMakeLists.txt
@@ -53,7 +53,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt b/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
index 6426853a664..9b0fbd66a4a 100644
--- a/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
+++ b/GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
@@ -51,7 +51,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/Generator/CMakeLists.txt b/GraphicsView/demo/Generator/CMakeLists.txt
index 984dd76b770..b9644157f9e 100644
--- a/GraphicsView/demo/Generator/CMakeLists.txt
+++ b/GraphicsView/demo/Generator/CMakeLists.txt
@@ -45,8 +45,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   cgal_add_compilation_test(Generator_2)
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL, and Qt5, and will not be compiled."
-  )
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/GraphicsView/CMakeLists.txt b/GraphicsView/demo/GraphicsView/CMakeLists.txt
index f21185f0fbd..51617b00b87 100644
--- a/GraphicsView/demo/GraphicsView/CMakeLists.txt
+++ b/GraphicsView/demo/GraphicsView/CMakeLists.txt
@@ -31,7 +31,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   cgal_add_compilation_test(min)
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt b/GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
index f853f269b66..3345c6df337 100644
--- a/GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
+++ b/GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
@@ -51,7 +51,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt b/GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
index 02e1504bfa2..ff7f9dc4b71 100644
--- a/GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
+++ b/GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
@@ -46,8 +46,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   cgal_add_compilation_test(Largest_empty_rectangle_2)
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL, and Qt5, and will not be compiled."
-  )
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt b/GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
index 1fcba00f1bb..993391e843a 100644
--- a/GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
+++ b/GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
@@ -58,7 +58,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   cgal_add_compilation_test(Periodic_2_Delaunay_triangulation_2)
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/Polygon/CMakeLists.txt b/GraphicsView/demo/Polygon/CMakeLists.txt
index d59836a1962..fc0a5e8cda2 100644
--- a/GraphicsView/demo/Polygon/CMakeLists.txt
+++ b/GraphicsView/demo/Polygon/CMakeLists.txt
@@ -18,10 +18,7 @@ find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5 Core)
 find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS
-      "NOTICE: This project requires the Eigen library, and will not be compiled."
-  )
+  message("NOTICE: This demo requires the Eigen library, and will not be compiled.")
   return()
 endif()
 
@@ -60,10 +57,5 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(Polygon_2)
 else()
-
-  message(
-    STATUS
-      "NOTICE: This demo requires CGAL, CGAL_Core, and Qt5, and will not be compiled."
-  )
-
+  message("NOTICE: This demo requires CGAL, CGAL_Core, and Qt5, and will not be compiled.")
 endif()
diff --git a/GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt b/GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
index 33153f23df0..2615db48f37 100644
--- a/GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
+++ b/GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
@@ -50,10 +50,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(Segment_voronoi_2)
-
 else()
-
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
-
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 endif()
diff --git a/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt b/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
index 2c46585863c..5f80bc0a62e 100644
--- a/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
+++ b/GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
@@ -50,8 +50,5 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(Segment_voronoi_linf_2)
 else()
-
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
-
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 endif()
diff --git a/GraphicsView/demo/Snap_rounding_2/CMakeLists.txt b/GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
index 6aa164e6d86..34af3f712aa 100644
--- a/GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
+++ b/GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
@@ -44,10 +44,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(Snap_rounding_2)
-
 else()
-
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
-
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 endif()
diff --git a/GraphicsView/demo/Spatial_searching_2/CMakeLists.txt b/GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
index 9fb9c869f2b..a67f0aa90d8 100644
--- a/GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
+++ b/GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
@@ -46,8 +46,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   cgal_add_compilation_test(Spatial_searching_2)
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL, and Qt5, and will not be compiled."
-  )
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/Stream_lines_2/CMakeLists.txt b/GraphicsView/demo/Stream_lines_2/CMakeLists.txt
index 36f479ebe4d..e45c19bc07a 100644
--- a/GraphicsView/demo/Stream_lines_2/CMakeLists.txt
+++ b/GraphicsView/demo/Stream_lines_2/CMakeLists.txt
@@ -48,7 +48,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/GraphicsView/demo/Triangulation_2/CMakeLists.txt b/GraphicsView/demo/Triangulation_2/CMakeLists.txt
index fdf6a86dd26..4560bc339dc 100644
--- a/GraphicsView/demo/Triangulation_2/CMakeLists.txt
+++ b/GraphicsView/demo/Triangulation_2/CMakeLists.txt
@@ -19,10 +19,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5)
 find_package(Qt5 QUIET COMPONENTS Widgets)
 
-if(NOT CGAL_Qt5_FOUND
-   OR NOT Qt5_FOUND)
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+if(NOT CGAL_Qt5_FOUND OR NOT Qt5_FOUND)
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
   return()
 endif()
 
diff --git a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt
index b766023186e..5d52ae0861b 100644
--- a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt
+++ b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt
@@ -21,12 +21,8 @@ endif()
 
 find_package(Eigen3 3.3.0)
 include(CGAL_Eigen3_support)
-
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS
-      "This project requires the Eigen library (3.3 or greater), and will not be compiled."
-  )
+  message("NOTICE: These examples require the Eigen library (3.3 or greater), and will not be compiled.")
   return()
 endif()
 
diff --git a/Heat_method_3/test/Heat_method_3/CMakeLists.txt b/Heat_method_3/test/Heat_method_3/CMakeLists.txt
index 98bd95f5d56..b248cc08734 100644
--- a/Heat_method_3/test/Heat_method_3/CMakeLists.txt
+++ b/Heat_method_3/test/Heat_method_3/CMakeLists.txt
@@ -22,10 +22,7 @@ endif()
 find_package(Eigen3 3.3.0)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS
-      "This project requires the  Eigen library (3.3 or greater), and will not be compiled."
-  )
+  message("NOTICE: These tests require the  Eigen library (3.3 or greater), and will not be compiled.")
   return()
 endif()
 
diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
index 1236c0453b1..b61e95c544a 100644
--- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
+++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt
@@ -39,8 +39,5 @@ if(CGAL_Qt5_FOUND
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test( HDT2 )
 else()
-  message(
-    STATUS
-      "NOTICE: This demo requires CGAL, CGAL_Core (or LEDA), and Qt5 and will not be compiled."
-  )
+  message("NOTICE: This demo requires CGAL_Core (or LEDA), and Qt5 and will not be compiled.")
 endif()
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index 19ba65d9900..3c0e1ec0fdb 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -24,8 +24,7 @@ include(GNUInstallDirs)
 
 if(CGAL_BRANCH_BUILD)
 
-  message(
-    STATUS "Build CGAL from ${CGAL_SCM_NAME}-branch: ${CGAL_SCM_BRANCH_NAME}")
+  message(STATUS "Build CGAL from ${CGAL_SCM_NAME}-branch: ${CGAL_SCM_BRANCH_NAME}")
 
   # list packages
   file(
diff --git a/Installation/cmake/modules/CGAL_pointmatcher_support.cmake b/Installation/cmake/modules/CGAL_pointmatcher_support.cmake
index ab55c3b86f9..19ca4ed14de 100644
--- a/Installation/cmake/modules/CGAL_pointmatcher_support.cmake
+++ b/Installation/cmake/modules/CGAL_pointmatcher_support.cmake
@@ -11,6 +11,6 @@ if(libpointmatcher_FOUND AND NOT TARGET CGAL::pointmatcher_support)
     target_include_directories(CGAL::pointmatcher_support INTERFACE "${libpointmatcher_INCLUDE_DIR}")
     target_link_libraries(CGAL::pointmatcher_support INTERFACE ${libpointmatcher_LIBRARIES})
   else()
-    message(STATUS "NOTICE : the libpointmatcher library requires the following boost components: thread filesystem system program_options date_time chrono.")
+    message(STATUS "NOTICE: the libpointmatcher library requires the following boost components: thread filesystem system program_options date_time chrono.")
   endif()
 endif()
diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
index 37576cd9dce..e3c35fe60a2 100644
--- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
+++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
@@ -10,9 +10,9 @@ find_package(CGAL REQUIRED)
 find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(TARGET CGAL::Eigen3_support)
+
   # Link with Boost.ProgramOptions (optional)
   find_package(Boost QUIET COMPONENTS program_options)
-
   if(Boost_PROGRAM_OPTIONS_FOUND)
     create_single_source_cgal_program("Mesh_estimation.cpp")
     target_link_libraries(Mesh_estimation PUBLIC CGAL::Eigen3_support)
@@ -22,18 +22,12 @@ if(TARGET CGAL::Eigen3_support)
       target_link_libraries(Mesh_estimation PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY})
     endif()
   else()
-    message(
-      STATUS
-        "NOTICE: This program requires Boost Program Options and will not be compiled."
-    )
+    message(STATUS "NOTICE: The example 'Mesh_estimation' requires Boost Program Options, and will not be compiled.")
   endif()
 
   create_single_source_cgal_program("Single_estimation.cpp")
   target_link_libraries(Single_estimation PUBLIC CGAL::Eigen3_support)
 
 else()
-  message(
-    STATUS
-      "NOTICE: This program requires Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: These examples require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt
index 55604c4c554..c371969ef24 100644
--- a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt
+++ b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt
@@ -13,8 +13,5 @@ if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("blind_1pt.cpp")
   target_link_libraries(blind_1pt PUBLIC CGAL::Eigen3_support)
 else()
-  message(
-    STATUS
-      "NOTICE: This program requires Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
index 8f715aac084..06cbe3335e9 100644
--- a/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
+++ b/Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
@@ -48,8 +48,7 @@ if(NOT
    (CGAL_Qt5_FOUND
     AND Qt5_FOUND))
 
-  message(STATUS "NOTICE: This demo requires CGAL, "
-                 "and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 else()
 
diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt
index b91fb018970..1044f4486a7 100644
--- a/Mesh_3/examples/Mesh_3/CMakeLists.txt
+++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt
@@ -23,9 +23,9 @@ endif()
 find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message( STATUS "NOTICE: All examples need the Eigen3 library, and will not be compiled." )
+  message("NOTICE: All examples require the Eigen3 library, and will not be compiled.")
   return()
-endif() #CGAL::Eigen_3_support
+endif()
 
 find_package(VTK QUIET COMPONENTS vtkImagingGeneral vtkIOImage NO_MODULE)
 if(VTK_FOUND)
@@ -166,21 +166,15 @@ if(TARGET CGAL::CGAL_ImageIO)
       target_link_libraries(mesh_3D_weighted_image
                             PUBLIC CGAL::Eigen3_support CGAL::ITK_support)
     else(ITK_FOUND)
-        message(STATUS "NOTICE: The examples that need ITK will not be compiled.")
+      message(STATUS "NOTICE: The examples that need ITK will not be compiled.")
     endif(ITK_FOUND)
 
   else()
-    message(
-      STATUS
-        "NOTICE: The examples mesh_3D_image.cpp, mesh_3D_weighted_image.cpp, mesh_3D_image_variable_size.cpp, mesh_optimization_example.cpp and mesh_optimization_lloyd_example.cpp need CGAL_ImageIO to be configured with ZLIB support, and will not be compiled."
-    )
+    message(STATUS "NOTICE: The examples mesh_3D_image.cpp, mesh_3D_weighted_image.cpp, mesh_3D_image_variable_size.cpp, mesh_optimization_example.cpp and mesh_optimization_lloyd_example.cpp need CGAL_ImageIO to be configured with ZLIB support, and will not be compiled.")
   endif()
 
 else()
-  message(
-    STATUS
-      "NOTICE: Some examples need the CGAL_ImageIO library, and will not be compiled."
-  )
+  message(STATUS "NOTICE: Some examples need the CGAL_ImageIO library, and will not be compiled.")
 endif()
 
 if(CGAL_ACTIVATE_CONCURRENT_MESH_3 AND TARGET CGAL::TBB_support)
diff --git a/NewKernel_d/test/NewKernel_d/CMakeLists.txt b/NewKernel_d/test/NewKernel_d/CMakeLists.txt
index c8d8f00f844..103bcabd9ca 100644
--- a/NewKernel_d/test/NewKernel_d/CMakeLists.txt
+++ b/NewKernel_d/test/NewKernel_d/CMakeLists.txt
@@ -6,10 +6,7 @@ cmake_minimum_required(VERSION 3.1...3.23)
 project(NewKernel_d_Tests)
 
 if(CMAKE_COMPILER_IS_GNUCCX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
-  message(
-    STATUS
-      "NOTICE: this directory requires a version of gcc >= 4.4, and will not be compiled."
-  )
+  message("NOTICE: this directory requires a version of gcc >= 4.4, and will not be compiled.")
   return()
 endif()
 
@@ -28,10 +25,5 @@ if(TARGET CGAL::Eigen3_support)
     target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
   endforeach()
 else()
-
-  message(
-    STATUS
-      "NOTICE: These programs require the Eigen3 library, and will not be compiled."
-  )
-
+  message("NOTICE: These programs require the Eigen3 library, and will not be compiled.")
 endif()
diff --git a/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt
index d7c0b148f90..cb165f79427 100644
--- a/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt
+++ b/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt
@@ -13,8 +13,7 @@ include(${CGAL_USE_FILE})
 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS "This project requires the Eigen library, and will not be compiled.")
+  message("NOTICE: This project requires the Eigen library, and will not be compiled.")
   return()
 endif()
 
diff --git a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt
index 822eb0d43c4..e35a681812b 100644
--- a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt
+++ b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt
@@ -9,8 +9,7 @@ find_package(CGAL REQUIRED)
 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS "This project requires the Eigen library, and will not be compiled.")
+  message("NOTICE: This project requires the Eigen library, and will not be compiled.")
   return()
 endif()
 
diff --git a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt
index e3f74be5219..bd6f6a443b3 100644
--- a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt
+++ b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt
@@ -9,8 +9,7 @@ find_package(CGAL REQUIRED)
 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS "This project requires the Eigen library, and will not be compiled.")
+  message("NOTICE: This project requires the Eigen library, and will not be compiled.")
   return()
 endif()
 
diff --git a/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt b/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
index fe35cc31bb4..81e68f53bd3 100644
--- a/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
+++ b/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/CMakeLists.txt
@@ -33,14 +33,10 @@ find_path(
   DOC "Path to the header of the CImg library")
 
 if(CIMG_INCLUDE_DIR)
-  message(
-    STATUS "CImg library found, the demo can load point set from image files.")
+  message(STATUS "NOTICE: CImg library found, the demo can load point set from image files.")
 else()
-  message(
-    STATUS
-      "CImg library was not found, the demo will not be able to load point set from image files. "
-      "Try setting the environment variable CIMG_INC_DIR to point to the path of the directory containing CImg.h."
-  )
+  message(STATUS "CImg library was not found, the demo will not be able to load point set from image files. "
+                 "Try setting the environment variable CIMG_INC_DIR to point to the path of the directory containing CImg.h.")
 endif()
 
 if(CGAL_Qt5_FOUND AND Qt5_FOUND)
@@ -105,10 +101,7 @@ else(
     set(OTR2_MISSING_DEPS "Qt5.4, ${OTR2_MISSING_DEPS}")
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This demo requires ${OTR2_MISSING_DEPS}and will not be compiled."
-  )
+  message("NOTICE: This demo requires ${OTR2_MISSING_DEPS} and will not be compiled.")
 
 endif(
   CGAL_Qt5_FOUND
diff --git a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt
index 5ff935ae611..22faeaf1c29 100644
--- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt
+++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt
@@ -10,8 +10,7 @@ find_package(CGAL REQUIRED COMPONENTS ImageIO)
 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS "This project requires the Eigen library, and will not be compiled.")
+  message("NOTICE: This project requires the Eigen library, and will not be compiled.")
   return()
 endif()
 
diff --git a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
index b763183740b..3692008579e 100644
--- a/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
+++ b/Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
@@ -97,9 +97,6 @@ else()
     )
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This demo requires ${PERIODIC_TRIANGULATION_MISSING_DEPS}and will not be compiled."
-  )
+  message("NOTICE: This demo requires ${PERIODIC_TRIANGULATION_MISSING_DEPS}and will not be compiled.")
 
 endif()
diff --git a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
index eccdac1b231..b92bb85a4c3 100644
--- a/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
+++ b/Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt
@@ -92,9 +92,6 @@ else(CGAL_Qt5_FOUND
         "${CGAL_QCOLLECTIONGENERATOR_TARGET}, ${PERIODIC_LLOYD_MISSING_DEPS}")
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This demo requires ${PERIODIC_LLOYD_MISSING_DEPS}and will not be compiled."
-  )
+  message("NOTICE: This demo requires ${PERIODIC_LLOYD_MISSING_DEPS} and will not be compiled.")
 
 endif()
diff --git a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
index 013be0260c8..a2b4110a07f 100644
--- a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
+++ b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
@@ -41,5 +41,5 @@ if((CGAL_Core_FOUND OR LEDA_FOUND)
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test(P4HDT2)
 else()
-  message(STATUS "NOTICE: This demo requires Qt5 and will not be compiled.")
+  message("NOTICE: This demo requires Qt5 and will not be compiled.")
 endif()
diff --git a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
index ddabef6c10d..1a7e63715ec 100644
--- a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
+++ b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
@@ -7,10 +7,6 @@ find_package(LEDA QUIET)
 if((CGAL_Core_FOUND OR LEDA_FOUND))
 
   create_single_source_cgal_program("p4ht2_example_insertion.cpp")
-
 else()
-
-  message(
-    STATUS "This program requires the CGAL library, and will not be compiled.")
-
+  message("NOTICE: This program requires the CGAL library, and will not be compiled.")
 endif()
diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
index f62e869c177..812dc8b307d 100644
--- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
+++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
@@ -14,12 +14,6 @@ if((CGAL_Core_FOUND OR LEDA_FOUND))
   create_single_source_cgal_program("test_p4ht2_removal_iterator.cpp")
   create_single_source_cgal_program("test_p4ht2_removal.cpp")
   create_single_source_cgal_program("test_p4ht2_insert_degenerate.cpp")
-
 else()
-
-  message(
-    STATUS
-      "This program requires the CGAL library and the GMP library, and will not be compiled."
-  )
-
+  message("NOTICE: This program requires the CGAL library and the GMP library, and will not be compiled.")
 endif()
diff --git a/Point_set_3/examples/Point_set_3/CMakeLists.txt b/Point_set_3/examples/Point_set_3/CMakeLists.txt
index 7fde9c1408d..f7600b60857 100644
--- a/Point_set_3/examples/Point_set_3/CMakeLists.txt
+++ b/Point_set_3/examples/Point_set_3/CMakeLists.txt
@@ -36,6 +36,8 @@ include(CGAL_Eigen3_support)
 if(EIGEN3_FOUND)
   create_single_source_cgal_program("point_set_algo.cpp")
   target_link_libraries(point_set_algo PUBLIC CGAL::Eigen3_support)
+else()
+  message(STATUS "NOTICE: The example 'point_set_algo' requires the Eigen library, and will not be compiled.")
 endif()
 
 create_single_source_cgal_program("draw_point_set_3.cpp")
diff --git a/Point_set_3/test/Point_set_3/CMakeLists.txt b/Point_set_3/test/Point_set_3/CMakeLists.txt
index bb283d43771..b7496eb6d5e 100644
--- a/Point_set_3/test/Point_set_3/CMakeLists.txt
+++ b/Point_set_3/test/Point_set_3/CMakeLists.txt
@@ -38,8 +38,8 @@ if(NOT MSVC_VERSION OR (MSVC_VERSION GREATER_EQUAL 1919 AND  MSVC_VERSION LESS 1
   if (TARGET CGAL::LASLIB_support)
     target_link_libraries(test_deprecated_io_ps PUBLIC CGAL::LASLIB_support)
   else()
-    message(STATUS "NOTICE : the LAS reader test requires LASlib and will not be compiled.")
+    message(STATUS "NOTICE: the LAS reader test requires LASlib, and will not be compiled.")
   endif()
 else()
-  message(STATUS "NOTICE : the LAS reader does not work with Visual Studio 2017.")
+  message(STATUS "NOTICE: the LAS reader does not work with Visual Studio 2017.")
 endif()
diff --git a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
index c4d8da3b0a0..39655c8b217 100644
--- a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
+++ b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
@@ -62,9 +62,7 @@ if(TARGET CGAL::LASLIB_support)
   create_single_source_cgal_program("read_las_example.cpp")
   target_link_libraries(read_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
 else()
-  message(
-    STATUS
-      "NOTICE : the LAS reader test requires LASlib and will not be compiled.")
+  message(STATUS "NOTICE: the LAS reader example requires LASlib and will not be compiled.")
 endif()
 
 # Use Eigen
@@ -102,11 +100,9 @@ if(TARGET CGAL::Eigen3_support)
     target_link_libraries(registration_with_pointmatcher PRIVATE ${CGAL_libs}
                           CGAL::pointmatcher_support)
   else()
-    message(
-      STATUS
-        "NOTICE : the registration_with_pointmatcher test requires libpointmatcher and will not be compiled."
-    )
+    message(STATUS "NOTICE: registration with pointmatcher requires libpointmatcher and will not be compiled.")
   endif()
+
   # Executables that require OpenGR
   find_package(OpenGR QUIET)
   include(CGAL_OpenGR_support)
@@ -115,10 +111,7 @@ if(TARGET CGAL::Eigen3_support)
     target_link_libraries(registration_with_OpenGR PRIVATE ${CGAL_libs}
                           CGAL::OpenGR_support)
   else()
-    message(
-      STATUS
-        "NOTICE : registration_with_OpenGR requires OpenGR, and will not be compiled."
-    )
+    message(STATUS "NOTICE: registration_with_OpenGR requires OpenGR, and will not be compiled.")
   endif()
 
   # Executables that require both libpointmatcher and OpenGR
@@ -129,15 +122,9 @@ if(TARGET CGAL::Eigen3_support)
       registration_with_opengr_pointmatcher_pipeline PRIVATE ${CGAL_libs}
       CGAL::pointmatcher_support CGAL::OpenGR_support)
   else()
-    message(
-      STATUS
-        "NOTICE : registration_with_opengr_pointmatcher_pipeline requires libpointmatcher and OpenGR, and will not be compiled."
-    )
+    message(STATUS "NOTICE: registration with OpenGR and pointmatcher requires both libpointmatcher and OpenGR, and will not be compiled.")
   endif()
 
 else()
-  message(
-    STATUS
-      "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message(STATUS "NOTICE: Some of the executables in this directory require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
index 895fae52907..52c6df32af0 100644
--- a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
+++ b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
@@ -46,10 +46,10 @@ if(NOT MSVC_VERSION OR (MSVC_VERSION GREATER_EQUAL 1919 AND  MSVC_VERSION LESS 1
     target_link_libraries(test_read_write_point_set PUBLIC ${CGAL_libs} CGAL::LASLIB_support)
     target_link_libraries(test_deprecated_io_point_set PUBLIC ${CGAL_libs} CGAL::LASLIB_support)
   else()
-    message(STATUS "NOTICE : the LAS reader test requires LASlib and will not be compiled.")
+    message(STATUS "NOTICE: the LAS reader test requires LASlib and will not be compiled.")
   endif()
 else()
-  message(STATUS "NOTICE : the LAS reader does not work with Visual Studio 2017.")
+  message(STATUS "NOTICE: the LAS reader does not work with Visual Studio 2017.")
 endif()
 
 # Use Eigen
@@ -76,10 +76,7 @@ if (EIGEN3_FOUND)
   create_single_source_cgal_program("jet_pointer_as_property_map.cpp")
   target_link_libraries(jet_pointer_as_property_map PUBLIC CGAL::Eigen3_support)
 else()
-  message(
-    STATUS
-      "NOTICE: This program requires Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message(STATUS "NOTICE: Some tests require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
 
 if(TARGET CGAL::TBB_support)
@@ -92,4 +89,6 @@ if(TARGET CGAL::TBB_support)
       target_link_libraries(${target} PUBLIC CGAL::TBB_support)
     endif()
   endforeach()
+else()
+  message(STATUS "NOTICE: Tests are not using TBB.")
 endif()
diff --git a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt
index 287652eae55..40694e9e5d1 100644
--- a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt
+++ b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt
@@ -32,7 +32,5 @@ if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("tutorial_example.cpp")
   target_link_libraries(tutorial_example PUBLIC CGAL::Eigen3_support)
 else()
-  message(
-    STATUS
-      "NOTICE: The examples need Eigen 3.1 (or greater) will not be compiled.")
+  message("NOTICE: The examples require Eigen 3.1 (or greater) will not be compiled.")
 endif()
diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
index baa4d41677a..11be7ccef68 100644
--- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
+++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
@@ -136,7 +136,7 @@ include(CGAL_METIS_support)
 if(TARGET CGAL::METIS_support)
   target_link_libraries(hausdorff_bounded_error_distance_example PUBLIC CGAL::METIS_support)
 else()
-  message(STATUS "Tests, which use the METIS library will not be compiled.")
+  message(STATUS "NOTICE: Examples that use the METIS library will not be compiled.")
 endif()
 
 find_package(TBB)
@@ -152,12 +152,13 @@ if(TARGET CGAL::TBB_support)
   create_single_source_cgal_program("corefinement_parallel_union_meshes.cpp")
   target_link_libraries(corefinement_parallel_union_meshes PUBLIC CGAL::TBB_support)
 else()
-  message(
-    STATUS "NOTICE: Intel TBB was not found. Sequential code will be used.")
+  message(STATUS "NOTICE: Intel TBB was not found. Sequential code will be used.")
 endif()
 
 find_package(Ceres QUIET)
 include(CGAL_Ceres_support)
 if(TARGET CGAL::Ceres_support)
   target_link_libraries(mesh_smoothing_example PUBLIC CGAL::Ceres_support)
-endif(TARGET CGAL::Ceres_support)
+else()
+  message(STATUS "NOTICE: The example 'mesh_smoothing_example' uses the Ceres library, and will not be compiled.")
+endif()
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
index 9eb13d3458e..f5a2182b27f 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt
@@ -117,7 +117,7 @@ include(CGAL_METIS_support)
 if(TARGET CGAL::METIS_support)
   target_link_libraries(test_hausdorff_bounded_error_distance PUBLIC CGAL::METIS_support)
 else()
-  message(STATUS "Tests, which use the METIS library will not be compiled.")
+  message(STATUS "NOTICE: Tests are not using METIS.")
 endif()
 
 if(TARGET CGAL::TBB_support)
@@ -127,15 +127,14 @@ if(TARGET CGAL::TBB_support)
   target_link_libraries(self_intersection_surface_mesh_test
                         PUBLIC CGAL::TBB_support)
 else()
-  message(
-    STATUS
-      "NOTICE: Intel TBB was not found. test_pmp_distance will use sequential code."
-  )
+  message(STATUS "NOTICE: Intel TBB was not found. Tests will use sequential code.")
 endif()
 
 if(OpenMesh_FOUND)
   create_single_source_cgal_program("remeshing_test_P_SM_OM.cpp")
   target_link_libraries(remeshing_test_P_SM_OM PRIVATE ${OPENMESH_LIBRARIES})
+else()
+  message(STATUS "NOTICE: Tests that use OpenMesh will not be compiled.")
 endif()
 
 find_package(Ceres QUIET)
diff --git a/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
index 9db1ae5e988..6f14f6590fb 100644
--- a/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
+++ b/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt
@@ -28,10 +28,7 @@ endif()
 find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS
-      "NOTICE: This project requires Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
   return()
 endif()
 
@@ -41,10 +38,7 @@ if(NOT TARGET CGAL::SCIP_support)
   find_package(GLPK QUIET)
   include(CGAL_GLPK_support)
   if(NOT TARGET CGAL::GLPK_support)
-    message(
-      STATUS
-        "NOTICE: This project requires either SCIP or GLPK, and will not be compiled."
-    )
+    message("NOTICE: This project requires either SCIP or GLPK, and will not be compiled.")
     return()
   endif()
 endif()
diff --git a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
index 7b6a992ea95..4d3142d9b4d 100644
--- a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
+++ b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt
@@ -28,10 +28,7 @@ endif()
 find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS
-      "NOTICE: This project requires Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
   return()
 endif()
 
@@ -41,10 +38,7 @@ if(NOT TARGET CGAL::SCIP_support)
   find_package(GLPK QUIET)
   include(CGAL_GLPK_support)
   if(NOT TARGET CGAL::GLPK_support)
-    message(
-      STATUS
-        "NOTICE: This project requires either SCIP or GLPK, and will not be compiled."
-    )
+    message("NOTICE: This project requires either SCIP or GLPK, and will not be compiled.")
     return()
   endif()
 endif()
diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt
index b3a6562f1c4..b66e739024b 100644
--- a/Polyhedron/demo/Polyhedron/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt
@@ -56,9 +56,7 @@ set_package_properties(
   Qt5 PROPERTIES
   TYPE REQUIRED
   PURPOSE "Enables the 3D Features, for GUI and visualization."
-  DESCRIPTION
-    "To find this package, it should be sufficient to fill the Qt5_DIR variable with : <Qt_dir>/<Qt_version>/<Compilator>/lib/cmake/Qt5"
-)
+  DESCRIPTION "To find this package, it should be sufficient to fill the Qt5_DIR variable with: <Qt_dir>/<Qt_version>/<Compilator>/lib/cmake/Qt5")
 
 if(Qt5_FOUND)
   add_definitions(-DQT_NO_KEYWORDS)
@@ -68,18 +66,19 @@ endif(Qt5_FOUND)
 find_package(Eigen3 3.2.0) #(requires 3.2.0 or greater)
 set_package_properties(
   Eigen3 PROPERTIES
-  DESCRIPTION "A library for mathematical tools."
-  PURPOSE
-    "Requiered for the Polyhedron Edit, Parameterization, Jet fitting, Classification plugin, Surface reconstruction, Normal estimation, Smoothing, Average spacing, Feature detection, Hole Filling and Fairing plugins ."
-)
+  DESCRIPTION "A library for linear algebra."
+  PURPOSE "Required for most plugins (Meshing, Mesh and Point Set Processing, etc.).")
 include(CGAL_Eigen3_support)
+if(NOT TARGET CGAL::Eigen3_support)
+  message(STATUS "NOTICE: Eigen was not found.")
+endif()
 
 find_package(METIS)
 include(CGAL_METIS_support)
 set_package_properties(
   METIS PROPERTIES
-  DESCRIPTION "A library for partitioning."
-  PURPOSE "Requiered for the partition plugin.")
+  DESCRIPTION "A library for graph partitioning."
+  PURPOSE "Required for the partition plugin.")
 
 # Activate concurrency?
 option(POLYHEDRON_DEMO_ACTIVATE_CONCURRENCY "Enable concurrency" ON)
@@ -87,10 +86,7 @@ if(POLYHEDRON_DEMO_ACTIVATE_CONCURRENCY)
   find_package(TBB)
   include(CGAL_TBB_support)
   if(NOT TARGET CGAL::TBB_support)
-    message(
-      STATUS
-        "NOTICE: Intel TBB was not found. Bilateral smoothing and WLOP plugins are faster if TBB is linked."
-    )
+    message(STATUS "NOTICE: Intel TBB was not found. Bilateral smoothing and WLOP plugins are faster if TBB is linked.")
   endif()
 endif()
 
@@ -98,11 +94,10 @@ endif()
 find_package(LibSSH)
 set_package_properties(
   LibSSH PROPERTIES
-  DESCRIPTION "A library used to enable the SSH features. "
-  PURPOSE "Requiered for loading (saving) a scene to (from) a distant server.")
-
+  DESCRIPTION "A library implementing the SSH protocol on client and server side. "
+  PURPOSE "Required for loading (saving) a scene to (from) a distant server.")
 if(NOT LIBSSH_FOUND)
-  message("NOTICE : The SSH features will be disabled.")
+  message(STATUS "NOTICE: The SSH features will be disabled.")
 endif()
 
 # Activate concurrency ? (turned OFF by default)
@@ -115,15 +110,11 @@ if(CGAL_ACTIVATE_CONCURRENT_MESH_3 OR "$ENV{CGAL_ACTIVATE_CONCURRENT_MESH_3}")
     find_package(TBB REQUIRED)
     include(CGAL_TBB_support)
     if(NOT TARGET CGAL::TBB_support)
-      message(
-        STATUS
-          "NOTICE: Intel TBB was not found. Mesh_3 is faster if TBB is linked.")
+      message(STATUS "NOTICE: Intel TBB was not found. Mesh_3 is faster if TBB is linked.")
     endif()
   endif()
-
 else(CGAL_ACTIVATE_CONCURRENT_MESH_3 OR "$ENV{CGAL_ACTIVATE_CONCURRENT_MESH_3}")
-  option(LINK_WITH_TBB
-         "Link with TBB anyway so we can use TBB timers for profiling" ON)
+  option(LINK_WITH_TBB "Link with TBB anyway so we can use TBB timers for profiling" ON)
   if(LINK_WITH_TBB)
     find_package(TBB)
     include(CGAL_TBB_support)
@@ -132,9 +123,8 @@ endif()
 
 set_package_properties(
   TBB PROPERTIES
-  DESCRIPTION
-    "A library for parallelism. Mesh_3, Bilateral smoothing and WLOP plugins are faster if TBB is linked."
-  PURPOSE "Requiered for running some algorithms in parallel.")
+  DESCRIPTION "A library for parallel programming."
+  PURPOSE "Plugins such as Mesh_3, Bilateral smoothing, and WLOP are faster if TBB is linked.")
 
 if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   include(${CGAL_USE_FILE})
@@ -212,8 +202,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
                                               Qt5::Script CGAL::CGAL_Qt5)
   if(TARGET Qt5::WebSockets)
     target_link_libraries(demo_framework PUBLIC Qt5::WebSockets)
-    message(
-      STATUS "Qt5WebSockets was found. Using WebSockets is therefore possible.")
+    message(STATUS "Qt5WebSockets was found. Using WebSockets is therefore possible.")
   endif()
 
   #compilation_of__demo_framework is defined in polyhedron_demo_macros.cmake
@@ -383,10 +372,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
     if(TARGET Qt5::ScriptTools)
       target_link_libraries(polyhedron_demo PUBLIC Qt5::ScriptTools)
     else()
-      message(
-        STATUS
-          "POLYHEDRON_QTSCRIPT_DEBUGGER is set to TRUE but the Qt5 ScriptTools library was not found."
-      )
+      message(STATUS "POLYHEDRON_QTSCRIPT_DEBUGGER is set to TRUE but the Qt5 ScriptTools library was not found.")
     endif()
   endif()
   target_link_libraries(Polyhedron_3 PRIVATE demo_framework)
@@ -433,8 +419,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
   if(TARGET Qt5::WebSockets AND TARGET Qt5::Network)
     add_executable(WS_server Server_ws.cpp)
     target_link_libraries(WS_server PUBLIC Qt5::WebSockets Qt5::Widgets Qt5::Network)
-    message(
-      STATUS "Qt5WebSockets was found. Using WebSockets is therefore possible.")
+    message(STATUS "Qt5WebSockets was found. Using WebSockets is therefore possible.")
   endif()
   #
   # Exporting
@@ -481,10 +466,7 @@ else(CGAL_Qt5_FOUND AND Qt5_FOUND)
     set(POLYHEDRON_MISSING_DEPS "Qt5, ${POLYHEDRON_MISSING_DEPS}")
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This demo requires ${POLYHEDRON_MISSING_DEPS}and will not be compiled."
-  )
+  message("NOTICE: This demo requires ${POLYHEDRON_MISSING_DEPS} and will not be compiled.")
 
 endif(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
@@ -495,7 +477,7 @@ feature_summary(
   QUIET_ON_EMPTY
   VAR NotFound_REQ_PACKAGES)
 if(NOT ${NotFound_REQ_PACKAGES} STREQUAL "")
-  message(STATUS "${NotFound_REQ_PACKAGES}")
+  message("${NotFound_REQ_PACKAGES}")
 endif()
 
 feature_summary(
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
index 4ed41201cf4..e2314c89202 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Classification/CMakeLists.txt
@@ -6,10 +6,7 @@ if(TARGET CGAL::Eigen3_support)
   include(CGAL_Boost_serialization_support)
   include(CGAL_Boost_iostreams_support)
   if(NOT TARGET CGAL::Boost_serialization_support OR NOT TARGET CGAL::Boost_iostreams_support)
-    message(
-      STATUS
-        "NOTICE: Boost IO Streams and/or Serialization not found, reading deprecated Classification config files won't be possible."
-    )
+    message(STATUS "NOTICE: Boost IO Streams and/or Serialization not found, reading deprecated Classification config files won't be possible.")
   endif()
 
   find_package(OpenCV QUIET COMPONENTS core ml) # Need core + machine learning
@@ -20,10 +17,7 @@ if(TARGET CGAL::Eigen3_support)
   )
   include(CGAL_OpenCV_support)
   if(NOT TARGET CGAL::OpenCV_support)
-    message(
-      STATUS
-        "NOTICE: OpenCV was not found. OpenCV random forest predicate for classification won't be available."
-    )
+    message(STATUS "NOTICE: OpenCV was not found. OpenCV random forest predicate for classification won't be available.")
   endif()
 
   qt5_wrap_ui(classificationUI_FILES Classification_widget.ui
@@ -69,8 +63,5 @@ if(TARGET CGAL::Eigen3_support)
   add_dependencies(classification_plugin point_set_selection_plugin selection_plugin)
 
 else()
-  message(
-    STATUS
-      "NOTICE: Eigen 3.1 (or greater) was not found. Classification plugin will not be available."
-  )
+  message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. Classification plugin will not be available.")
 endif()
diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt
index d7ed3ec6bb8..7d404d7f196 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt
@@ -3,8 +3,8 @@ include(polyhedron_demo_macros)
 find_package(LASLIB)
 set_package_properties(
   LASLIB PROPERTIES
-  DESCRIPTION "A library for some I/O."
-  PURPOSE "Requiered for reading or writing LAS files.")
+  DESCRIPTION "A library for LIDAR I/O."
+  PURPOSE "Required for reading or writing LAS files.")
 
 include(CGAL_LASLIB_support)
 
@@ -68,22 +68,13 @@ if(VTK_FOUND)
                                        ${VTK_LIBRARIES})
       target_compile_definitions(vtk_plugin  PRIVATE -DCGAL_USE_VTK)
     else()
-      message(
-        STATUS
-          "NOTICE : the vtk IO plugin needs VTK libraries and will not be compiled."
-      )
+      message(STATUS "NOTICE: the vtk IO plugin needs VTK libraries and will not be compiled.")
     endif()
   else()
-    message(
-      STATUS
-        "NOTICE : the vtk IO plugin needs VTK 6.0 or greater and will not be compiled (incorrect version found)."
-    )
+    message(STATUS "NOTICE: the vtk IO plugin needs VTK 6.0 or greater and will not be compiled (incorrect version found).")
   endif()
 else()
-  message(
-    STATUS
-      "NOTICE : the vtk IO plugin needs VTK 6.0 or greater and will not be compiled."
-  )
+  message(STATUS "NOTICE: the vtk IO plugin needs VTK 6.0 or greater and will not be compiled.")
 endif()
 polyhedron_demo_plugin(xyz_plugin XYZ_io_plugin KEYWORDS Viewer PointSetProcessing Classification)
 target_link_libraries(xyz_plugin PUBLIC scene_points_with_normal_item)
@@ -92,10 +83,7 @@ list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_rvalue_references has_cxx_rvalues)
 list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_variadic_templates has_cxx_variadic)
 
 if(has_cxx_rvalues LESS 0 OR has_cxx_variadic LESS 0)
-  message(
-    STATUS
-      "NOTICE : LAS/PLY IO examples require a C++11 compiler and will not be compiled."
-  )
+  message(STATUS "NOTICE: LAS/PLY IO examples require a C++11 compiler and will not be compiled.")
 else()
   set(needed_cxx_features cxx_rvalue_references cxx_variadic_templates)
 
@@ -113,10 +101,7 @@ else()
         PUBLIC "-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS")
     endif()
   else()
-    message(
-      STATUS
-        "NOTICE : the LAS IO plugin needs LAS libraries and will not be compiled."
-    )
+    message(STATUS "NOTICE: the LAS IO plugin needs LAS libraries and will not be compiled.")
   endif()
 endif()
 
@@ -138,8 +123,5 @@ if(3MF_LIBRARIES
   target_link_libraries(io_3mf_plugin PRIVATE scene_surface_mesh_item scene_points_with_normal_item scene_polylines_item ${3MF_LIBRARIES})
   target_compile_definitions(io_3mf_plugin PRIVATE -DCGAL_LINKED_WITH_3MF)
 else()
-  message(
-    STATUS
-      "NOTICE : The 3mf_io_plugin requires the lib3MF library in a version < 2.0, and will not be compiled."
-  )
+  message(STATUS "NOTICE: The 3mf_io_plugin requires the lib3MF library in a version < 2.0, and will not be compiled.")
 endif()
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
index 89d05476c46..ab8d02e1d80 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
@@ -44,22 +44,13 @@ if(VTK_FOUND)
       set(VTK_LIBRARIES VTK::IOImage VTK::ImagingGeneral)
     endif()
     if(NOT VTK_LIBRARIES)
-      message(
-        STATUS
-          "NOTICE : the DICOM files (.dcm) need VTK libraries to be open and will not be able to."
-      )
+      message(STATUS "NOTICE: DICOM files (.dcm) require the VTK libraries, and will not be readable.")
     endif()
   else()
-    message(
-      STATUS
-        "NOTICE : the DICOM files (.dcm) need VTK libraries to be open and will not be able to."
-    )
+    message(STATUS "NOTICE: DICOM files (.dcm) require the VTK libraries, and will not be readable.")
   endif()
 else()
-  message(
-    STATUS
-      "NOTICE : the DICOM files (.dcm) need VTK libraries to be open and will not be able to."
-  )
+  message(STATUS "NOTICE: DICOM files (.dcm) require the VTK libraries, and will not be readable.")
 endif()
 
 find_package(Boost QUIET OPTIONAL_COMPONENTS filesystem system)
@@ -82,10 +73,7 @@ if(Boost_FILESYSTEM_FOUND)
     target_link_libraries(io_image_plugin PUBLIC ${Boost_LIBRARIES})
   endif()
 else()
-  message(
-    STATUS
-      "NOTICE : the Io_image_plugin needs boost-filesystem to work and will not be compiled"
-  )
+  message(STATUS "NOTICE: the Io_image_plugin requires boost-filesystem, and will not be compiled")
 endif()
 polyhedron_demo_plugin(
   mesh_3_optimization_plugin
@@ -101,17 +89,14 @@ target_link_libraries(
          scene_implicit_function_item)
 
 # Use Eigen
-find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
+find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
-
 if(TARGET CGAL::Eigen3_support)
   target_link_libraries(mesh_3_optimization_plugin PUBLIC CGAL::Eigen3_support)
-else() #eigen
-  message(
-    STATUS
-      "The Mesh_3_optimization_plugin requires Eigen, which was not found, and will use a deprecated class to replace it. Warnings are to be expected."
-  )
-endif() #eigen
+else()
+  message(STATUS "NOTICE: The Mesh_3_optimization_plugin requires Eigen, which was not found."
+                 "A deprecated class will be used to replace it. Warnings are to be expected.")
+endif()
 
 polyhedron_demo_plugin(c3t3_io_plugin C3t3_io_plugin KEYWORDS Viewer Mesh_3)
 target_link_libraries(c3t3_io_plugin PUBLIC scene_c3t3_item)
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/CMakeLists.txt
index 82d8554f6e3..628d00b72d3 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/CMakeLists.txt
@@ -25,7 +25,5 @@ target_link_libraries(diff_between_meshes_plugin PUBLIC scene_surface_mesh_item)
    polyhedron_demo_plugin(partition_plugin Partition_graph_plugin ${partitionUI_FILES})
    target_link_libraries(partition_plugin PUBLIC scene_surface_mesh_item CGAL::METIS_support )
 else()
-  message(
-    "NOTICE : the Partition plugin needs METIS libraries and will not be compiled."
-  )
+  message(STATUS "NOTICE: the Partition plugin needs METIS libraries and will not be compiled.")
 endif()
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
index 53cfdc9b825..adcd4f7f02b 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/CMakeLists.txt
@@ -1,16 +1,12 @@
 include(polyhedron_demo_macros)
-if(TARGET CGAL::Eigen3_support)
 
+if(TARGET CGAL::Eigen3_support)
   polyhedron_demo_plugin(jet_fitting_plugin Jet_fitting_plugin)
   target_link_libraries(
     jet_fitting_plugin PUBLIC scene_surface_mesh_item scene_polylines_item
                               CGAL::Eigen3_support)
-
 else()
-  message(
-    STATUS
-      "NOTICE: Eigen 3.1 (or greater) was not found. Jet fitting plugin will not be available."
-  )
+  message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. Jet fitting plugin will not be available.")
 endif()
 
 polyhedron_demo_plugin(extrude_plugin Extrude_plugin KEYWORDS PMP)
@@ -64,17 +60,10 @@ if(TARGET CGAL::Eigen3_support)
           PROPERTIES RESOURCE_LOCK Selection_test_resources)
         endif()
   else()
-    message(
-      STATUS
-        "NOTICE: The hole filling and fairing plugins require Eigen 3.2 (or higher) and will not be available."
-    )
+    message(STATUS "NOTICE: The hole filling and fairing plugins require Eigen 3.2 (or higher) and will not be available.")
   endif()
-
-else(EIGEN3_FOUND)
-  message(
-    STATUS
-      "NOTICE: The hole filling and fairing plugins require Eigen 3.2 (or higher) and will not be available."
-  )
+else()
+  message(STATUS "NOTICE: The hole filling and fairing plugins require Eigen 3.2 (or higher) and will not be available.")
 endif()
 
 qt5_wrap_ui(soupUI_FILES Repair_soup.ui)
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt
index ef370a1fbe6..702e4a1898e 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt
@@ -5,9 +5,8 @@ if(TARGET CGAL::Eigen3_support)
 
   set_package_properties(
     SCIP PROPERTIES
-    DESCRIPTION "A solver."
-    PURPOSE
-      "Can be used as a solver in the surface_reconstruction_plugin plugin.")
+    DESCRIPTION "A solver for mixed integer programming."
+    PURPOSE "Can be used as a solver in the surface_reconstruction_plugin plugin.")
 
   include(CGAL_SCIP_support)
   if(NOT TARGET CGAL::SCIP_support)
@@ -16,17 +15,13 @@ if(TARGET CGAL::Eigen3_support)
     set_package_properties(
       GLPK PROPERTIES
       DESCRIPTION "An alternative for SCIP."
-      PURPOSE
-        "Can be used as a solver in the surface_reconstruction_plugin plugin.")
+      PURPOSE "Can be used as a solver in the surface_reconstruction_plugin plugin.")
 
     include(CGAL_GLPK_support)
   endif()
 
   if(NOT TARGET CGAL::SCIP_support AND NOT TARGET CGAL::GLPK_support)
-    message(
-      STATUS
-        "NOTICE: SCIP and GLPK were not found. Polygonal surface reconstruction will not be available."
-    )
+    message(STATUS "NOTICE: SCIP and GLPK were not found. Polygonal surface reconstruction will not be available.")
   endif()
 
   qt5_wrap_ui(surface_reconstructionUI_FILES Surface_reconstruction_plugin.ui)
@@ -118,33 +113,14 @@ if(TARGET CGAL::Eigen3_support)
                             PUBLIC CGAL::pointmatcher_support)
     endif()
   else()
-    message(
-      STATUS
-        "NOTICE: OpenGR and libpointmatcher were not found. Registration plugin will not be available."
-    )
+    message(STATUS "NOTICE: OpenGR and libpointmatcher were not found. Registration plugin will not be available.")
   endif()
-
-else(EIGEN3_FOUND)
-  message(
-    STATUS
-      "NOTICE: Eigen 3.1 (or greater) was not found. Surface reconstruction plugin will not be available."
-  )
-  message(
-    STATUS
-      "NOTICE: Eigen 3.1 (or greater) was not found. Normal estimation plugins will not be available."
-  )
-  message(
-    STATUS
-      "NOTICE: Eigen 3.1 (or greater) was not found. Smoothing plugin will not be available."
-  )
-  message(
-    STATUS
-      "NOTICE: Eigen 3.1 (or greater) was not found. Average spacing plugin will not be available."
-  )
-  message(
-    STATUS
-      "NOTICE: Eigen 3.1 (or greater) was not found. Feature detection plugin will not be available."
-  )
+else()
+  message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. Surface reconstruction plugin will not be available.")
+  message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. Normal estimation plugins will not be available.")
+  message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. Smoothing plugin will not be available.")
+  message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. Average spacing plugin will not be available.")
+  message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. Feature detection plugin will not be available.")
 endif()
 
 qt5_wrap_ui(point_set_bilateral_smoothingUI_FILES
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt
index 682998322e0..4e553fbde16 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/CMakeLists.txt
@@ -23,10 +23,7 @@ if(NOT CGAL_DISABLE_GMP)
     endif()
 
   else()
-    message(
-      STATUS
-        "NOTICE: Eigen 3.1 (or greater) was not found. The Parameterization plugin will not be available."
-    )
+    message(STATUS "NOTICE: Eigen 3.1 (or greater) was not found. The Parameterization plugin will not be available.")
   endif()
 
   qt5_wrap_ui(segmentationUI_FILES Mesh_segmentation_widget.ui)
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/CMakeLists.txt
index 0954a8c13c3..b7f9d81ad41 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/CMakeLists.txt
@@ -12,8 +12,5 @@ if(EIGEN3_FOUND AND "${EIGEN3_VERSION}" VERSION_GREATER "3.1.90")
   endif()
 
 else()
-  message(
-    STATUS
-      "NOTICE: The polyhedron edit plugin require Eigen 3.2 (or higher) and will not be available."
-  )
+  message(STATUS "NOTICE: The polyhedron edit plugin requires Eigen 3.2 (or higher) and will not be available.")
 endif()
diff --git a/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt b/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
index f11de800034..98faad76be3 100644
--- a/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
+++ b/Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt
@@ -59,9 +59,6 @@ else(CGAL_Qt5_FOUND AND Qt5_FOUND)
     set(MESH_3_MISSING_DEPS "Qt5, ${MESH_3_MISSING_DEPS}")
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This demo requires ${MESH_3_MISSING_DEPS}and will not be compiled."
-  )
+  message("NOTICE: This demo requires ${MESH_3_MISSING_DEPS} and will not be compiled.")
 
 endif(CGAL_Qt5_FOUND AND Qt5_FOUND)
diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt b/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
index d920d36fcc7..002fd913902 100644
--- a/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
+++ b/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
@@ -48,7 +48,6 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
 
 else()
 
-  message(
-    STATUS "NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL and Qt5, and will not be compiled.")
 
 endif()
diff --git a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
index d1ee8325335..60b1475d431 100644
--- a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
+++ b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
@@ -20,10 +20,7 @@ find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5)
 find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS
-      "NOTICE: This project requires the Eigen library, and will not be compiled."
-  )
+  message("NOTICE: This project requires the Eigen library, and will not be compiled.")
   return()
 endif()
 
@@ -73,9 +70,6 @@ else(CGAL_Qt5_FOUND AND Qt5_FOUND)
     set(PCA_MISSING_DEPS "Qt5, ${PCA_MISSING_DEPS}")
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This demo requires ${PCA_MISSING_DEPS} and will not be compiled."
-  )
+  message("NOTICE: This demo requires ${PCA_MISSING_DEPS} and will not be compiled.")
 
 endif(CGAL_Qt5_FOUND AND Qt5_FOUND)
diff --git a/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt
index 01bbb5c99af..6ba4150b812 100644
--- a/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt
+++ b/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package(CGAL REQUIRED)
 find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(STATUS  "NOTICE: This project requires Eigen 3.1 (or greater) and will not be compiled.")
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
   return()
 endif()
 
diff --git a/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt
index a4ea754853f..9fb9d3a75db 100644
--- a/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt
+++ b/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt
@@ -10,7 +10,7 @@ find_package(CGAL REQUIRED)
 find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(STATUS  "NOTICE: This project requires Eigen 3.1 (or greater) and will not be compiled.")
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
   return()
 endif()
 
diff --git a/Property_map/examples/Property_map/CMakeLists.txt b/Property_map/examples/Property_map/CMakeLists.txt
index b33ebc34768..e1f2e269e23 100644
--- a/Property_map/examples/Property_map/CMakeLists.txt
+++ b/Property_map/examples/Property_map/CMakeLists.txt
@@ -28,4 +28,6 @@ include(CGAL_Eigen3_support)
 if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("custom_property_map.cpp")
   target_link_libraries(custom_property_map PUBLIC CGAL::Eigen3_support)
+else()
+  message(STATUS "NOTICE: The example 'custom_property_map' requires Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt
index 74b132ea916..c8e1f4d9e83 100644
--- a/Ridges_3/examples/Ridges_3/CMakeLists.txt
+++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt
@@ -31,14 +31,8 @@ if(TARGET CGAL::Eigen3_support)
       target_link_libraries(Ridges_Umbilics_LCC PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY})
     endif()
   else()
-    message(
-      STATUS
-        "NOTICE: This programs require Boost Program Options and will not be compiled."
-    )
+    message("NOTICE: This project requires Boost Program Options and will not be compiled.")
   endif()
 else()
-  message(
-    STATUS
-      "NOTICE: This program requires Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Ridges_3/test/Ridges_3/CMakeLists.txt b/Ridges_3/test/Ridges_3/CMakeLists.txt
index ae33dbe2534..73fcc4e7f89 100644
--- a/Ridges_3/test/Ridges_3/CMakeLists.txt
+++ b/Ridges_3/test/Ridges_3/CMakeLists.txt
@@ -13,10 +13,5 @@ if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("ridge_test.cpp")
   target_link_libraries(ridge_test PUBLIC CGAL::Eigen3_support)
 else()
-
-  message(
-    STATUS
-      "NOTICE: This program requires Eigen 3.1 (or greater) and will not be compiled."
-  )
-
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/STL_Extension/test/STL_Extension/CMakeLists.txt b/STL_Extension/test/STL_Extension/CMakeLists.txt
index 98018bcf782..65a100afa6d 100644
--- a/STL_Extension/test/STL_Extension/CMakeLists.txt
+++ b/STL_Extension/test/STL_Extension/CMakeLists.txt
@@ -62,4 +62,6 @@ endif()
 if(OpenMesh_FOUND)
   create_single_source_cgal_program("test_hash_OpenMesh.cpp")
   target_link_libraries(test_hash_OpenMesh PRIVATE ${OPENMESH_LIBRARIES})
+else()
+  message(STATUS "NOTICE: Tests that use OpenMesh will not be compiled.")
 endif()
diff --git a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt
index 2532c9defb5..ba2c593d83e 100644
--- a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt
+++ b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt
@@ -10,9 +10,7 @@ if(ACTIVATE_CONCURRENCY)
   find_package(TBB)
   include(CGAL_TBB_support)
   if(NOT TARGET CGAL::TBB_support)
-    message(
-      STATUS
-        "NOTICE: Intel TBB NOT found! The example is faster if TBB is linked.")
+    message(STATUS "NOTICE: Intel TBB not found. Examples are faster if TBB is linked.")
   endif()
 endif()
 
@@ -35,8 +33,5 @@ if(TARGET CGAL::Eigen3_support)
     target_link_libraries(scale_space_advancing_front PUBLIC CGAL::TBB_support)
   endif()
 else()
-  message(
-    STATUS
-      "NOTICE: The example needs Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: Examples require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Shape_detection/test/Shape_detection/CMakeLists.txt b/Shape_detection/test/Shape_detection/CMakeLists.txt
index 92e45de666c..149f34e57f0 100644
--- a/Shape_detection/test/Shape_detection/CMakeLists.txt
+++ b/Shape_detection/test/Shape_detection/CMakeLists.txt
@@ -59,4 +59,6 @@ if(EIGEN3_FOUND)
     target_link_libraries(test_validity_sampled_data CGAL::CGAL CGAL::Data CGAL::Eigen3_support)
   endif()
   cgal_add_test(test_validity_sampled_data)
+else()
+  message(STATUS "NOTICE: Some tests require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Shape_regularization/benchmark/Shape_regularization/CMakeLists.txt b/Shape_regularization/benchmark/Shape_regularization/CMakeLists.txt
index e0c8987322e..84e8e1a509a 100644
--- a/Shape_regularization/benchmark/Shape_regularization/CMakeLists.txt
+++ b/Shape_regularization/benchmark/Shape_regularization/CMakeLists.txt
@@ -27,5 +27,5 @@ if(TARGET CGAL::OSQP_support)
     endif()
   endforeach()
 else()
-  message(NOTICE "OSQP was not found. OSQP benchmarks won't be available.")
+  message("NOTICE: OSQP was not found. OSQP benchmarks won't be available.")
 endif()
diff --git a/Shape_regularization/examples/Shape_regularization/CMakeLists.txt b/Shape_regularization/examples/Shape_regularization/CMakeLists.txt
index adfb948e463..d01c9585a16 100644
--- a/Shape_regularization/examples/Shape_regularization/CMakeLists.txt
+++ b/Shape_regularization/examples/Shape_regularization/CMakeLists.txt
@@ -34,10 +34,10 @@ if(TARGET CGAL::OSQP_support)
     create_single_source_cgal_program("regularize_real_data_2.cpp")
     target_link_libraries(regularize_real_data_2 PUBLIC CGAL::Eigen3_support CGAL::OSQP_support)
   else()
-    message(NOTICE "Eigen was not found. Eigen examples won't be available.")
+    message(STATUS "NOTICE: Eigen was not found. Eigen examples won't be available.")
   endif()
 else()
-  message(NOTICE "OSQP was not found. OSQP examples won't be available.")
+  message(STATUS "NOTICE: OSQP was not found. OSQP examples won't be available.")
 endif()
 
 create_single_source_cgal_program("regularize_framework.cpp")
diff --git a/Shape_regularization/test/Shape_regularization/CMakeLists.txt b/Shape_regularization/test/Shape_regularization/CMakeLists.txt
index 5bb7cc98ef3..96ce53eb1a5 100644
--- a/Shape_regularization/test/Shape_regularization/CMakeLists.txt
+++ b/Shape_regularization/test/Shape_regularization/CMakeLists.txt
@@ -31,7 +31,7 @@ if(TARGET CGAL::OSQP_support)
     endif()
   endforeach()
 else()
-  message(NOTICE "OSQP was not found. OSQP tests won't be available.")
+  message(STATUS "NOTICE: OSQP was not found. OSQP tests won't be available.")
 endif()
 
 set(targets
diff --git a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
index 3de1179c2f5..f053e7e5079 100644
--- a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
+++ b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
@@ -25,8 +25,5 @@ if(ESBTL_FOUND)
   include_directories(${ESBTL_INCLUDE_DIR})
   create_single_source_cgal_program("skin_surface_pdb_reader.cpp")
 else(ESBTL_FOUND)
-  message(
-    STATUS
-      "NOTICE: skin_surface_pdb_reader.cpp requires ESBTL library, and will not be compiled."
-  )
+  message(STATUS "NOTICE: skin_surface_pdb_reader.cpp requires ESBTL library, and will not be compiled.")
 endif(ESBTL_FOUND)
diff --git a/Solver_interface/examples/Solver_interface/CMakeLists.txt b/Solver_interface/examples/Solver_interface/CMakeLists.txt
index a8ce3e9a528..b269af2e059 100644
--- a/Solver_interface/examples/Solver_interface/CMakeLists.txt
+++ b/Solver_interface/examples/Solver_interface/CMakeLists.txt
@@ -16,6 +16,8 @@ if(TARGET CGAL::Eigen3_support)
   target_link_libraries(sparse_solvers PUBLIC CGAL::Eigen3_support)
   create_single_source_cgal_program("diagonalize_matrix.cpp")
   target_link_libraries(diagonalize_matrix PUBLIC CGAL::Eigen3_support)
+else()
+  message(STATUS "NOTICE: Eigen3 was not found. Some examples won't be available.")
 endif()
 
 find_package(OSQP QUIET)
@@ -23,8 +25,7 @@ include(CGAL_OSQP_support)
 if(TARGET CGAL::OSQP_support)
   create_single_source_cgal_program("osqp_quadratic_program.cpp")
   target_link_libraries(osqp_quadratic_program PUBLIC CGAL::OSQP_support)
-  message("OSQP found and used")
-
+  message(STATUS "OSQP found and used")
 else()
   message(STATUS "NOTICE: OSQP was not found. OSQP examples won't be available.")
 endif()
@@ -34,23 +35,16 @@ include(CGAL_SCIP_support)
 if(TARGET CGAL::SCIP_support)
   create_single_source_cgal_program("mixed_integer_program.cpp")
   target_link_libraries(mixed_integer_program PUBLIC CGAL::SCIP_support)
-  message("SCIP found and used")
-
+  message(STATUS "SCIP found and used")
 else()
   find_package(GLPK QUIET)
   include(CGAL_GLPK_support)
   if(TARGET CGAL::GLPK_support)
     create_single_source_cgal_program("mixed_integer_program.cpp")
     target_link_libraries(mixed_integer_program PUBLIC CGAL::GLPK_support)
-    message("GLPK found and used")
-
+    message(STATUS "GLPK found and used")
   else()
-
-    message(
-      STATUS
-        "NOTICE : This project requires either SCIP or GLPK, and will not be compiled. "
-        "Please provide either 'SCIP_DIR' or 'GLPK_INCLUDE_DIR' and 'GLPK_LIBRARIES'"
-    )
-
+    message(STATUS "NOTICE: This project requires either SCIP or GLPK, and will not be compiled. "
+                   "Please provide either 'SCIP_DIR' or 'GLPK_INCLUDE_DIR' and 'GLPK_LIBRARIES'")
   endif()
 endif()
diff --git a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
index 9dd43a935e1..374ff11054d 100644
--- a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
+++ b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
@@ -44,13 +44,8 @@ if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("general_neighbor_searching.cpp")
   target_link_libraries(general_neighbor_searching PUBLIC CGAL::Eigen3_support)
 else()
-
-  message(STATUS "fuzzy_range_query.cpp and general_neighbor_searching.cpp")
-  message(
-    STATUS
-      "will not be compiled as they use CGAL::Epick_d which requires the Eigen library."
-  )
-
+  message(STATUS "NOTICE: The examples 'fuzzy_range_query' and 'general_neighbor_searching'")
+  message(STATUS "will not be compiled as they use CGAL::Epick_d, which requires the Eigen library.")
 endif()
 
 find_package(TBB QUIET)
@@ -59,5 +54,5 @@ if(TARGET CGAL::TBB_support)
   create_single_source_cgal_program("parallel_kdtree.cpp")
   target_link_libraries(parallel_kdtree PUBLIC CGAL::TBB_support)
 else()
-  message(STATUS "parallel_kdtree.cpp requires TBB and will not be compiled")
+  message(STATUS "NOTICE: The example 'parallel_kdtree' requires TBB, and will not be compiled")
 endif()
diff --git a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt
index 56b2fffadd5..c6e8c6c0d51 100644
--- a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt
+++ b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt
@@ -17,5 +17,5 @@ if(CGAL_Qt5_FOUND)
   target_link_libraries(draw_straight_skeleton_2 PUBLIC CGAL::CGAL_Basic_viewer)
   target_link_libraries(exterior_offset_of_multiple_polygons_with_holes PUBLIC CGAL::CGAL_Basic_viewer)
 else()
-  message(STATUS "NOTICE: The example draw_straight_skeleton_2 requires Qt and will not be compiled.")
+  message(STATUS "NOTICE: The example 'draw_straight_skeleton_2' requires Qt and will not be compiled.")
 endif()
diff --git a/Stream_support/test/Stream_support/CMakeLists.txt b/Stream_support/test/Stream_support/CMakeLists.txt
index ade4d2c88f8..15c115bd3fa 100644
--- a/Stream_support/test/Stream_support/CMakeLists.txt
+++ b/Stream_support/test/Stream_support/CMakeLists.txt
@@ -27,10 +27,7 @@ foreach(cppfile ${cppfiles})
       create_single_source_cgal_program("${cppfile}")
       target_link_libraries(test_3mf_to_sm PRIVATE ${3MF_LIBRARIES})
     else()
-      message(
-        STATUS
-          "NOTICE : This program requires the lib3MF library, and will not be compiled."
-      )
+      message(STATUS "NOTICE: Some tests require the lib3MF library, and will not be compiled.")
     endif()
   else()
     create_single_source_cgal_program("${cppfile}")
diff --git a/Surface_mesh/test/Surface_mesh/CMakeLists.txt b/Surface_mesh/test/Surface_mesh/CMakeLists.txt
index 0796515d99d..ce006010e98 100644
--- a/Surface_mesh/test/Surface_mesh/CMakeLists.txt
+++ b/Surface_mesh/test/Surface_mesh/CMakeLists.txt
@@ -25,5 +25,5 @@ if(3MF_LIBRARIES AND 3MF_INCLUDE_DIR  AND EXISTS "${3MF_INCLUDE_DIR}/Model/COM/N
   target_link_libraries(test_deprecated_io_sm PRIVATE ${3MF_LIBRARIES})
   target_compile_definitions(test_deprecated_io_sm PRIVATE -DCGAL_LINKED_WITH_3MF)
 else()
-  message(STATUS "NOTICE : read_3mf requires the lib3MF library, and will not be tested.")
+  message(STATUS "NOTICE: read_3mf requires the lib3MF library, and will not be tested.")
 endif()
diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt
index 49b649baf99..a76d0e049f7 100644
--- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt
+++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt
@@ -19,8 +19,7 @@ endif()
 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS "This project requires the Eigen library, and will not be compiled.")
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
   return()
 endif()
 
diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt
index 64fb53467a0..cb8582389d6 100644
--- a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt
+++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt
@@ -19,8 +19,7 @@ endif()
 find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
 include(CGAL_Eigen3_support)
 if(NOT TARGET CGAL::Eigen3_support)
-  message(
-    STATUS "This project requires the Eigen library, and will not be compiled.")
+  message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.")
   return()
 endif()
 
diff --git a/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt b/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt
index 625c8fbcbcd..ca4ca2ffd1e 100644
--- a/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt
+++ b/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt
@@ -11,8 +11,5 @@ if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("benchmark_for_concept_models.cpp")
   target_link_libraries(benchmark_for_concept_models PUBLIC CGAL::Eigen3_support)
 else()
-  message(
-    STATUS
-      "This program requires the Eigen library, version 3.1 or later and will not be compiled."
-  )
+  message("NOTICE: This program requires requires Eigen 3.1 (or greater) or later and will not be compiled.")
 endif()
diff --git a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt
index 778b63e37ec..40354505e1b 100644
--- a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt
+++ b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt
@@ -20,8 +20,5 @@ if(TARGET CGAL::Eigen3_support)
   target_link_libraries(deform_mesh_for_botsch08_format
                         PUBLIC CGAL::Eigen3_support)
 else()
-  message(
-    STATUS
-      "NOTICE: This program requires the Eigen library, version 3.2 or later and will not be compiled."
-  )
+  message("NOTICE: This program requires requires Eigen 3.1.91 (or greater) or later and will not be compiled.")
 endif()
diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt
index 80137f8569b..168b336edff 100644
--- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt
+++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt
@@ -38,12 +38,9 @@ if(TARGET CGAL::Eigen3_support)
     target_link_libraries(all_roi_assign_example_with_OpenMesh
                           PRIVATE ${OPENMESH_LIBRARIES} CGAL::Eigen3_support)
   else()
-    message(STATUS "Example that use OpenMesh will not be compiled.")
+    message(STATUS "NOTICE: Examples that use OpenMesh will not be compiled.")
   endif()
 
 else()
-  message(
-    STATUS
-      "NOTICE: These examples require the Eigen library, version 3.2 or later and will not be compiled."
-  )
+  message("NOTICE: These examples require Eigen 3.1.91 (or greater) or later and will not be compiled.")
 endif()
diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt
index 001902d0187..5046d551a55 100644
--- a/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt
+++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt
@@ -23,11 +23,8 @@ if(TARGET CGAL::Eigen3_support)
     target_link_libraries(Cactus_deformation_session_OpenMesh
                           PRIVATE ${OPENMESH_LIBRARIES} CGAL::Eigen3_support)
   else()
-    message(STATUS "Example that use OpenMesh will not be compiled.")
+    message(STATUS "NOTICE: Examples that use OpenMesh will not be compiled.")
   endif()
 else()
-  message(
-    STATUS
-      "NOTICE: These tests require the Eigen library, version 3.2 or later and will not be compiled."
-  )
+  message("NOTICE: These tests require the Eigen library, version 3.1.91 or later and will not be compiled.")
 endif()
diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
index 0c373f160c6..d4c54e35640 100644
--- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
+++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
@@ -37,16 +37,10 @@ if(TARGET CGAL::Eigen3_support)
       add_definitions(-DEIGEN_DONT_ALIGN_STATICALLY)
       add_definitions(-DCGAL_SMP_USE_SPARSESUITE_SOLVERS)
     else()
-      message(
-        STATUS
-          "NOTICE: The example `orbifold.cpp` will be compiled without the Sparsesuite library and UmfPack. Try setting SuiteSparse_UMF_INCLUDE_DIR and at least one of SuiteSparse_UMFPACK_LIBRARY_RELEASE and SuiteSparse_UMFPACK_LIBRARY_DEBUG to you UMFPACK installation."
-      )
+      message(STATUS "NOTICE: The example `orbifold.cpp` will be compiled without the Sparsesuite library and UmfPack. Try setting SuiteSparse_UMF_INCLUDE_DIR and at least one of SuiteSparse_UMFPACK_LIBRARY_RELEASE and SuiteSparse_UMFPACK_LIBRARY_DEBUG to you UMFPACK installation.")
     endif()
   else(SuiteSparse_FOUND)
-    message(
-      STATUS
-        "NOTICE: The example `orbifold.cpp` will be compiled without the Sparsesuite library."
-    )
+    message(STATUS "NOTICE: The example `orbifold.cpp` will be compiled without the Sparsesuite library.")
   endif(SuiteSparse_FOUND)
 
   # ------------------------------------------------------------------
@@ -72,8 +66,5 @@ if(TARGET CGAL::Eigen3_support)
   endif()
 
 else()
-  message(
-    STATUS
-      "NOTICE: The examples require Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: The examples require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt
index b8567b47ad3..81d75a3ce49 100644
--- a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt
+++ b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt
@@ -13,8 +13,5 @@ if(TARGET CGAL::Eigen3_support)
   target_link_libraries(extensive_parameterization_test
                         PUBLIC CGAL::Eigen3_support)
 else()
-  message(
-    STATUS
-      "NOTICE: The tests require Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: The tests require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/CMakeLists.txt b/Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/CMakeLists.txt
index 86cfaeb0351..67c248833c6 100644
--- a/Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/CMakeLists.txt
+++ b/Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/CMakeLists.txt
@@ -19,5 +19,5 @@ if(OpenMesh_FOUND)
   create_single_source_cgal_program("shortest_paths_OpenMesh.cpp")
   target_link_libraries(shortest_paths_OpenMesh PRIVATE ${OPENMESH_LIBRARIES})
 else()
-  message(STATUS "Examples that use OpenMesh will not be compiled.")
+  message(STATUS "NOTICE: Examples that use OpenMesh will not be compiled.")
 endif()
diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt
index 973af0b75e3..95099585460 100644
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt
@@ -26,14 +26,8 @@ if(Boost_PROGRAM_OPTIONS_FOUND)
       target_link_libraries(TestMesh PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY})
     endif()
   else()
-    message(
-      STATUS
-        "NOTICE: Example TestMesh.cpp requires the CGAL_Core library (or LEDA) and will not be compiled."
-    )
+    message(STATUS "NOTICE: The example TestMesh.cpp requires the CGAL_Core library (or LEDA) and will not be compiled.")
   endif()
 else()
-  message(
-    STATUS
-      "NOTICE: Example TestMesh.cpp requires boost program_option and will not be compiled."
-  )
+  message(STATUS "NOTICE: The example TestMesh.cpp requires boost program_option and will not be compiled.")
 endif()
diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt
index 2af41a74f0a..68f1f271083 100644
--- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt
+++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt
@@ -50,6 +50,8 @@ endif()
 if(OpenMesh_FOUND)
   create_single_source_cgal_program("edge_collapse_OpenMesh.cpp")
   target_link_libraries(edge_collapse_OpenMesh PRIVATE ${OPENMESH_LIBRARIES})
+else()
+  message(STATUS "NOTICE: Examples that use OpenMesh will not be compiled.")
 endif()
 
 find_package(METIS)
@@ -57,10 +59,9 @@ include(CGAL_METIS_support)
 
 find_package(TBB)
 include(CGAL_TBB_support)
-
 if(TARGET CGAL::TBB_support AND TARGET CGAL::METIS_support)
   create_single_source_cgal_program("collapse_small_edges_in_parallel.cpp")
   target_link_libraries(collapse_small_edges_in_parallel PUBLIC CGAL::TBB_support CGAL::METIS_support)
 else()
-  message(STATUS "collapse_small_edges_in_parallel, which use the METIS and TBB libraries will not be compiled.")
+  message(STATUS "NOTICE: The example 'collapse_small_edges_in_parallel' uses the METIS and TBB libraries, and will not be compiled.")
 endif()
diff --git a/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt
index e66903608e9..e809e5b742d 100644
--- a/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt
+++ b/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt
@@ -42,8 +42,5 @@ if(TARGET CGAL::Eigen3_support)
     target_link_libraries( MCF_Skeleton_om_example PUBLIC CGAL::Eigen3_support PRIVATE ${OPENMESH_LIBRARIES})
   endif()
 else()
-  message(
-    STATUS
-      "These programs require the Eigen library (3.2 or greater), and will not be compiled."
-  )
+  message("NOTICE: These programs require the Eigen library (3.2 or greater), and will not be compiled.")
 endif()
diff --git a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt
index 91a2c82d39a..0c39993aed8 100644
--- a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt
+++ b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt
@@ -8,15 +8,11 @@ find_package(CGAL REQUIRED)
 
 find_package(Eigen3 3.2.0) #(requires 3.2.0 or greater)
 include(CGAL_Eigen3_support)
-
 if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("MCF_Skeleton_test.cpp")
   target_link_libraries(MCF_Skeleton_test PUBLIC CGAL::Eigen3_support)
   create_single_source_cgal_program("skeleton_connectivity_test.cpp")
   target_link_libraries(skeleton_connectivity_test PUBLIC CGAL::Eigen3_support)
 else()
-  message(
-    STATUS
-      "These tests require the Eigen library (3.2 or greater), and will not be compiled."
-  )
+  message("NOTICE: These tests require the Eigen library (3.2 or greater), and will not be compiled.")
 endif()
diff --git a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
index aab8a082853..f5eb723ef7f 100644
--- a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
+++ b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
@@ -11,13 +11,11 @@ if(CGAL_ImageIO_FOUND)
   create_single_source_cgal_program("mesh_an_implicit_function.cpp")
 
 else()
+
   if(RUNNING_CGAL_AUTO_TEST)
     # Just to avoid a warning from CMake if that variable is set on the command line...
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This program requires the CGAL and CGAL ImageIO libraries, and will not be compiled."
-  )
+  message("NOTICE: This project requires the CGAL and CGAL ImageIO libraries, and will not be compiled.")
 
 endif()
diff --git a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
index 380b7ff60d7..c74b11a60ad 100644
--- a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
+++ b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt
@@ -44,6 +44,6 @@ create_single_source_cgal_program( "mesh_and_remesh_polyhedral_domain_with_featu
     target_link_libraries(mesh_and_remesh_polyhedral_domain_with_features PRIVATE CGAL::TBB_support)
   endif()
 else()
-  message(STATUS "Some examples need the Eigen3 library, and will not be compiled.")
+  message(STATUS "NOTICE: Some examples require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
 
diff --git a/Triangulation/applications/Triangulation/CMakeLists.txt b/Triangulation/applications/Triangulation/CMakeLists.txt
index d0928bb79ce..8febe2625c7 100644
--- a/Triangulation/applications/Triangulation/CMakeLists.txt
+++ b/Triangulation/applications/Triangulation/CMakeLists.txt
@@ -21,6 +21,10 @@ endif()
 
 find_package(Eigen3 3.1.0)
 include(CGAL_Eigen3_support)
+if(NOT TARGET CGAL::Eigen3_support)
+  message("NOTICE: Applications require Eigen 3.1 (or greater), and will not be compiled")
+  return()
+endif()
 
 # include for local directory
 include_directories(BEFORE include)
diff --git a/Triangulation/benchmark/Triangulation/CMakeLists.txt b/Triangulation/benchmark/Triangulation/CMakeLists.txt
index 47e4945c25b..a1c4160d2fb 100644
--- a/Triangulation/benchmark/Triangulation/CMakeLists.txt
+++ b/Triangulation/benchmark/Triangulation/CMakeLists.txt
@@ -18,8 +18,5 @@ if(TARGET CGAL::Eigen3_support)
   target_link_libraries(Td_vs_T2_and_T3 PUBLIC CGAL::Eigen3_support)
 
 else()
-  message(
-    STATUS
-      "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: Executables in this directory require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Triangulation/examples/Triangulation/CMakeLists.txt b/Triangulation/examples/Triangulation/CMakeLists.txt
index 4a8d458026a..0574b70126e 100644
--- a/Triangulation/examples/Triangulation/CMakeLists.txt
+++ b/Triangulation/examples/Triangulation/CMakeLists.txt
@@ -5,10 +5,7 @@ cmake_minimum_required(VERSION 3.1...3.23)
 project(Triangulation_Examples)
 
 if(CMAKE_COMPILER_IS_GNUCCX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
-  message(
-    STATUS
-      "NOTICE: this directory requires a version of gcc >= 4.4, and will not be compiled."
-  )
+  message("NOTICE: Examples in this directory require a version of gcc >= 4.4, and will not be compiled.")
   return()
 endif()
 
@@ -37,8 +34,5 @@ if(TARGET CGAL::Eigen3_support)
     target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
   endforeach()
 else()
-  message(
-    STATUS
-      "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: Examples in this directory require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Triangulation/test/Triangulation/CMakeLists.txt b/Triangulation/test/Triangulation/CMakeLists.txt
index 9f04381d282..292869eee6c 100644
--- a/Triangulation/test/Triangulation/CMakeLists.txt
+++ b/Triangulation/test/Triangulation/CMakeLists.txt
@@ -5,10 +5,7 @@ cmake_minimum_required(VERSION 3.1...3.23)
 project(Triangulation_Tests)
 
 if(CMAKE_COMPILER_IS_GNUCCX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
-  message(
-    STATUS
-      "NOTICE: this directory requires a version of gcc >= 4.4, and will not be compiled."
-  )
+  message("NOTICE: Examples in this directory require a version of gcc >= 4.4, and will not be compiled.")
   return()
 endif()
 
@@ -31,8 +28,5 @@ if(TARGET CGAL::Eigen3_support)
   endforeach()
 
 else()
-  message(
-    STATUS
-      "NOTICE: Some of the executables in this directory need Eigen 3.1 (or greater) and will not be compiled."
-  )
+  message("NOTICE: Tests in this directory require Eigen 3.1 (or greater), and will not be compiled.")
 endif()
diff --git a/Triangulation_2/examples/Triangulation_2/CMakeLists.txt b/Triangulation_2/examples/Triangulation_2/CMakeLists.txt
index 179ea91a3e7..e4f5e7392ee 100644
--- a/Triangulation_2/examples/Triangulation_2/CMakeLists.txt
+++ b/Triangulation_2/examples/Triangulation_2/CMakeLists.txt
@@ -20,8 +20,5 @@ if(CGAL_Qt5_FOUND)
   target_link_libraries(draw_triangulation_2 PUBLIC CGAL::CGAL_Basic_viewer)
   target_link_libraries(star_conflict_zone PUBLIC CGAL::CGAL_Basic_viewer)
 else()
-  message(
-    STATUS
-      "NOTICE: Several examples require Qt and will not be compiled."
-  )
+  message(STATUS "NOTICE: Several examples require Qt5 and will not be compiled.")
 endif()
diff --git a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
index 512c39d52fa..15fc236f473 100644
--- a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
+++ b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
@@ -94,10 +94,7 @@ else(Qt5_FOUND)
     set(TRIANGULATION_3_MISSING_DEPS "Qt5, ${TRIANGULATION_3_MISSING_DEPS}")
   endif()
 
-  message(
-    STATUS
-      "NOTICE: This demo requires ${TRIANGULATION_3_MISSING_DEPS}and will not be compiled."
-  )
+  message("NOTICE: This demo requires ${TRIANGULATION_3_MISSING_DEPS}, and will not be compiled.")
 
 endif(
   CGAL_Qt5_FOUND
diff --git a/Triangulation_3/examples/Triangulation_3/CMakeLists.txt b/Triangulation_3/examples/Triangulation_3/CMakeLists.txt
index 3bc81426b94..f69ece8b238 100644
--- a/Triangulation_3/examples/Triangulation_3/CMakeLists.txt
+++ b/Triangulation_3/examples/Triangulation_3/CMakeLists.txt
@@ -25,6 +25,8 @@ create_single_source_cgal_program("simplex.cpp")
 create_single_source_cgal_program("draw_triangulation_3.cpp")
 if(CGAL_Qt5_FOUND)
   target_link_libraries(draw_triangulation_3 PUBLIC CGAL::CGAL_Basic_viewer)
+else()
+  message(STATUS "NOTICE: The example 'draw_triangulation_3' requires Qt5, and will not be compiled.")
 endif()
 
 find_package(TBB QUIET)
@@ -46,5 +48,5 @@ if(TARGET CGAL::TBB_support)
       PROPERTY RUN_SERIAL 1)
   endif()
 else()
-  message(STATUS "NOTICE: a few examples require TBB and will not be compiled.")
+  message(STATUS "NOTICE: A few examples require TBB, and will not be compiled.")
 endif()
diff --git a/Triangulation_3/test/Triangulation_3/CMakeLists.txt b/Triangulation_3/test/Triangulation_3/CMakeLists.txt
index 20960afe639..19983c752f3 100644
--- a/Triangulation_3/test/Triangulation_3/CMakeLists.txt
+++ b/Triangulation_3/test/Triangulation_3/CMakeLists.txt
@@ -41,6 +41,8 @@ if(TARGET CGAL::TBB_support)
       execution___of__test_regular_insert_range_with_info
       PROPERTY RUN_SERIAL 1)
   endif()
+else()
+  message(STATUS "NOTICE: The TBB library was not found. Some tests will not be available.")
 endif()
 
 if(BUILD_TESTING)
diff --git a/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt b/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
index 865b4681f0c..4312001ac0a 100644
--- a/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
+++ b/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
@@ -48,5 +48,5 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND TARGET CGAL::Eigen3_support)
   include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake)
   cgal_add_compilation_test( Triangulation_on_sphere_2_Demo )
 else()
-  message(STATUS "NOTICE: This demo requires CGAL, Qt5 and OpenGL, and will not be compiled.")
+  message("NOTICE: This demo requires CGAL, Qt5, and Eigen, and will not be compiled.")
 endif()
diff --git a/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt b/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt
index a9b9fba423d..36405ad2cb7 100644
--- a/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt
+++ b/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt
@@ -22,7 +22,5 @@ if ( CGAL_FOUND )
   endif()
 
 else()
-
-    message(STATUS "This program requires the CGAL library, and will not be compiled.")
-
+  message(STATUS "NOTICE: The Eigen library was not found. The test 'test_dtos_dual' will not be compiled.")
 endif()
diff --git a/Voronoi_diagram_2/examples/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/examples/Voronoi_diagram_2/CMakeLists.txt
index 7d6f692ba0d..3408ad984cb 100644
--- a/Voronoi_diagram_2/examples/Voronoi_diagram_2/CMakeLists.txt
+++ b/Voronoi_diagram_2/examples/Voronoi_diagram_2/CMakeLists.txt
@@ -17,4 +17,6 @@ endforeach()
 
 if(CGAL_Qt5_FOUND)
   target_link_libraries(draw_voronoi_diagram_2 PUBLIC CGAL::CGAL_Basic_viewer)
+else()
+  message(STATUS "NOTICE: The Qt5 library was not found. The example 'draw_voronoi_diagram_2' will not be compiled.")
 endif()
diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt
index c6a29500bef..052f1966487 100644
--- a/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt
+++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt
@@ -16,8 +16,9 @@ create_single_source_cgal_program("vda_sdg.cpp")
 
 find_package(Eigen3 3.2.0) #(requires 3.2.0 or greater)
 include(CGAL_Eigen3_support)
-
 if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("vda_tos2.cpp")
   target_link_libraries(vda_tos2 PUBLIC CGAL::Eigen3_support)
+else()
+  message(STATUS "NOTICE: The Eigen library was not found. The test 'vda_tos2' will not be available.")
 endif()
diff --git a/Weights/examples/Weights/CMakeLists.txt b/Weights/examples/Weights/CMakeLists.txt
index 4521e9cc475..1ab1057ae14 100644
--- a/Weights/examples/Weights/CMakeLists.txt
+++ b/Weights/examples/Weights/CMakeLists.txt
@@ -20,5 +20,5 @@ if(TARGET CGAL::Eigen3_support)
   create_single_source_cgal_program("weighted_laplacian.cpp")
   target_link_libraries(weighted_laplacian PUBLIC CGAL::Eigen3_support)
 else()
-  message(NOTICE "Several examples require the Eigen library, and will not be compiled.")
+  message(STATUS "NOTICE: The Eigen library was not found. The example 'weighted_laplacian' will not be compiled.")
 endif()