From e7779fefc69d33cc129c792862667aa7b43a4dba Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Fri, 8 Sep 2023 17:48:39 -0400 Subject: [PATCH] cmake: BuildFIO.cmake should not introduce -std=gnu++17 Not correct in general, and a build bug because fio-objectstore includes c++20 headers. Fixes: https://tracker.ceph.com/issues/62778 Add CXX_EXTENSIONS ON, and cleanup INTERFACE_COMPILE_OPTIONS per Kefu review Signed-off-by: Matt Benjamin --- cmake/modules/BuildFIO.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/modules/BuildFIO.cmake b/cmake/modules/BuildFIO.cmake index 3a0694b543e..49fcfb31d97 100644 --- a/cmake/modules/BuildFIO.cmake +++ b/cmake/modules/BuildFIO.cmake @@ -37,6 +37,7 @@ function(build_fio) add_library(fio INTERFACE IMPORTED) add_dependencies(fio fio_ext) set_target_properties(fio PROPERTIES + CXX_EXTENSIONS ON INTERFACE_INCLUDE_DIRECTORIES ${source_dir} - INTERFACE_COMPILE_OPTIONS "-include;${source_dir}/config-host.h;$<$:-std=gnu99>$<$:-std=gnu++17>") + INTERFACE_COMPILE_OPTIONS "-include;${source_dir}/config-host.h;$<$:-std=gnu99>") endfunction()