]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: BuildFIO.cmake should not introduce -std=gnu++17 53346/head
authorMatt Benjamin <mbenjamin@redhat.com>
Fri, 8 Sep 2023 21:48:39 +0000 (17:48 -0400)
committerMatt Benjamin <mbenjamin@redhat.com>
Sun, 10 Sep 2023 15:41:38 +0000 (11:41 -0400)
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 <mbenjamin@redhat.com>
cmake/modules/BuildFIO.cmake

index 3a0694b543eed3e2ad4ed8c6be15bcc22d4a48f5..49fcfb31d973e1266e1f7f4f9ff7f3bd997e67c7 100644 (file)
@@ -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;$<$<COMPILE_LANGUAGE:C>:-std=gnu99>$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>")
+    INTERFACE_COMPILE_OPTIONS "-include;${source_dir}/config-host.h;$<$<COMPILE_LANGUAGE:C>:-std=gnu99>")
 endfunction()