diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 549fa328f..6e7fd3895 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -14,7 +14,11 @@ target_include_directories(acpp-common
 target_link_libraries(acpp-common PRIVATE ${HIPSYCL_STDPAR_RT_LINKER_FLAGS})
 
 list(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_SOURCE_DIR}/cmake/")
-find_package(Filesystem REQUIRED Final Experimental Boost)
+find_package(Filesystem Final Experimental)
+if(NOT Filesystem_FOUND)
+    # we only try to find Boost filesystem if neither the regular nor experimental std::filesystem have been found
+    find_package(Filesystem REQUIRED Boost)
+endif()
 set(CXX_FILESYSTEM_HEADER "${CXX_FILESYSTEM_HEADER}" PARENT_SCOPE)
 set(CXX_FILESYSTEM_NAMESPACE "${CXX_FILESYSTEM_NAMESPACE}" PARENT_SCOPE)
 list(REMOVE_AT CMAKE_MODULE_PATH 0)