diff --git a/range_queries/CMakeLists.txt b/range_queries/CMakeLists.txt
new file mode 100644
index 000000000..c9f0c86f0
--- /dev/null
+++ b/range_queries/CMakeLists.txt
@@ -0,0 +1,18 @@
+# If necessary, use the RELATIVE flag, otherwise each source file may be listed
+# with full pathname. RELATIVE may makes it easier to extract an executable name
+# automatically.
+file( GLOB APP_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp )
+# file( GLOB APP_SOURCES ${CMAKE_SOURCE_DIR}/*.c )
+# AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} APP_SOURCES)
+foreach( testsourcefile ${APP_SOURCES} )
+    # I used a simple string replace, to cut off .cpp.
+    string( REPLACE ".cpp" "" testname ${testsourcefile} )
+    add_executable( ${testname} ${testsourcefile} )
+
+    set_target_properties(${testname} PROPERTIES LINKER_LANGUAGE CXX)
+    if(OpenMP_CXX_FOUND)
+        target_link_libraries(${testname} OpenMP::OpenMP_CXX)
+    endif()
+    install(TARGETS ${testname} DESTINATION "bin/range_queries")
+
+endforeach( testsourcefile ${APP_SOURCES} )
diff --git a/range_queries/sparse_table.cpp b/range_queries/sparse_table_range_queries.cpp
similarity index 100%
rename from range_queries/sparse_table.cpp
rename to range_queries/sparse_table_range_queries.cpp