From db835e3de018761558071bf35bd309ca3da147ad Mon Sep 17 00:00:00 2001 From: Paul Bauer Date: Sat, 17 Feb 2024 09:16:12 +0100 Subject: [PATCH] Change configuration to only search for boost filesystem if std::filesystem has not been found Small fix for configuration to only try to detect and use boost filesystem if a previous search for it in the stdlib hasn't been successful. Refs #1345 --- src/common/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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)