diff --git a/NewKernel_d/test/NewKernel_d/CMakeLists.txt b/NewKernel_d/test/NewKernel_d/CMakeLists.txt
index c039a4e45b0..931c38db9a0 100644
--- a/NewKernel_d/test/NewKernel_d/CMakeLists.txt
+++ b/NewKernel_d/test/NewKernel_d/CMakeLists.txt
@@ -18,13 +18,20 @@ find_package(CGAL REQUIRED)
 find_package(Eigen3)
 include(CGAL_Eigen3_support)
 if(TARGET CGAL::Eigen3_support)
-  create_single_source_cgal_program("Epick_d.cpp")
-  target_link_libraries(Epick_d PUBLIC CGAL::Eigen3_support)
+  file(
+    GLOB cppfiles
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+  foreach(cppfile ${cppfiles})
+    get_filename_component(target ${cppfile} NAME_WE)
+    create_single_source_cgal_program("${cppfile}")
+    target_link_libraries(${target} PUBLIC CGAL::Eigen3_support)
+  endforeach()
 else()
 
   message(
     STATUS
-      "NOTICE: This program requires the Eigen3 library, and will not be compiled."
+      "NOTICE: These programs require the Eigen3 library, and will not be compiled."
   )
 
 endif()