diff --git a/CGAL_Core/include/CGAL/CORE/Config.h b/CGAL_Core/include/CGAL/CORE/Config.h
index 9f49a7f5986..36a342a5f73 100644
--- a/CGAL_Core/include/CGAL/CORE/Config.h
+++ b/CGAL_Core/include/CGAL/CORE/Config.h
@@ -29,12 +29,10 @@
 
 #include <CGAL/export/CORE.h>
 
-#ifdef CGAL_TEST_SUITE
-// disabled for the testsuite to avoid `w`
-#define CGAL_CORE_warning_msg(X ,Y)
-// if (!(X)) CGAL_error_msg(Y)
-#else
+#ifdef CGAL_CORE_DEBUG
 #define CGAL_CORE_warning_msg(X ,Y) CGAL_warning_msg(X ,Y)
+#else
+#define CGAL_CORE_warning_msg(X ,Y)
 #endif
 
 
diff --git a/Installation/cmake/modules/CGALHelpers.cmake b/Installation/cmake/modules/CGALHelpers.cmake
index de42f8cf269..f29fd11111b 100644
--- a/Installation/cmake/modules/CGALHelpers.cmake
+++ b/Installation/cmake/modules/CGALHelpers.cmake
@@ -9,7 +9,7 @@ function(process_CGAL_subdirectory entry subdir type_name)
     make_directory("${CMAKE_BINARY_DIR}/${subdir}/${ENTRY_DIR_NAME}")
   endif()
 
-  message("\n-- Configuring ${subdir} in ${subdir}/${ENTRY_DIR_NAME}")
+  message("-- Configuring ${subdir} in ${subdir}/${ENTRY_DIR_NAME}")
 
   set(source_dir "")
   if(EXISTS ${entry}/CMakeLists.txt)
diff --git a/Installation/demo/CMakeLists.txt b/Installation/demo/CMakeLists.txt
index 92606a5b9d2..9bf4e2e9e0e 100644
--- a/Installation/demo/CMakeLists.txt
+++ b/Installation/demo/CMakeLists.txt
@@ -1,7 +1,15 @@
 cmake_minimum_required(VERSION 3.12...3.31)
+project(CGAL_Demos)
 
-if(NOT CGAL_MODULES_DIR)
-  find_package(CGAL REQUIRED)
-endif()
-include(${CGAL_MODULES_DIR}/CGALHelpers.cmake)
-CGAL_handle_subdirectories(demo demos)
+file(GLOB pkgs RELATIVE ${CMAKE_SOURCE_DIR} "*")
+list(SORT pkgs)
+
+message("== Generating build files for demos ==")
+foreach(pkg ${pkgs})
+  set(pkg_dir ${CMAKE_SOURCE_DIR}/${pkg})
+  if(IS_DIRECTORY "${pkg_dir}" AND EXISTS "${pkg_dir}/CMakeLists.txt")
+    message("\n-- Configuring ${pkg}")
+    add_subdirectory(${pkg_dir} "${CMAKE_BINARY_DIR}/${pkg}")
+  endif()
+endforeach()
+message("== Generating build files for done (DONE) ==")
diff --git a/Installation/examples/CMakeLists.txt b/Installation/examples/CMakeLists.txt
index e0034b4727f..f96a030628d 100644
--- a/Installation/examples/CMakeLists.txt
+++ b/Installation/examples/CMakeLists.txt
@@ -1,6 +1,15 @@
 cmake_minimum_required(VERSION 3.12...3.31)
-if(NOT CGAL_MODULES_DIR)
-  find_package(CGAL REQUIRED)
-endif()
-include(${CGAL_MODULES_DIR}/CGALHelpers.cmake)
-CGAL_handle_subdirectories(examples examples)
+project(CGAL_Examples)
+
+file(GLOB pkgs RELATIVE ${CMAKE_SOURCE_DIR} "*")
+list(SORT pkgs)
+
+message("== Generating build files for examples ==")
+foreach(pkg ${pkgs})
+  set(pkg_dir ${CMAKE_SOURCE_DIR}/${pkg})
+  if(IS_DIRECTORY "${pkg_dir}" AND EXISTS "${pkg_dir}/CMakeLists.txt")
+    message("\n-- Configuring ${pkg}")
+    add_subdirectory(${pkg_dir} "${CMAKE_BINARY_DIR}/${pkg}")
+  endif()
+endforeach()
+message("== Generating build files for done (DONE) ==")
diff --git a/Installation/test/CMakeLists.txt b/Installation/test/CMakeLists.txt
index 64d616edd57..183796527e1 100644
--- a/Installation/test/CMakeLists.txt
+++ b/Installation/test/CMakeLists.txt
@@ -1,8 +1,15 @@
 cmake_minimum_required(VERSION 3.12...3.31)
+project(CGAL_Tests)
 
+file(GLOB pkgs RELATIVE ${CMAKE_SOURCE_DIR} "*")
+list(SORT pkgs)
 
-if(NOT CGAL_MODULES_DIR)
-  find_package(CGAL REQUIRED)
-endif()
-include(${CGAL_MODULES_DIR}/CGALHelpers.cmake)
-CGAL_handle_subdirectories(test tests)
+message("== Generating build files for tests ==")
+foreach(pkg ${pkgs})
+  set(pkg_dir ${CMAKE_SOURCE_DIR}/${pkg})
+  if(IS_DIRECTORY "${pkg_dir}" AND EXISTS "${pkg_dir}/CMakeLists.txt")
+    message("\n-- Configuring ${pkg}")
+    add_subdirectory(${pkg_dir} "${CMAKE_BINARY_DIR}/${pkg}")
+  endif()
+endforeach()
+message("== Generating build files for done (DONE) ==")
diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp
index 74e63634183..94f8dfcfd3f 100644
--- a/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp
+++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/vsa_metric_test.cpp
@@ -102,7 +102,7 @@ int main()
   }
 
   // create compact metric approximation algorithm instance
-  std::cout << "create compact vas instance" << std::endl;
+  std::cout << "create compact vsa instance" << std::endl;
   Compact_metric_point_proxy error_metric(center_pmap, area_pmap);
 
   Compact_approx approx(mesh, vpmap, error_metric);