From af89b667157071eab3a1d478cf7c9e3ec8160e89 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 11 Sep 2018 13:56:25 +0200 Subject: [PATCH] cmake: no libradosstriper headers if WITH_LIBRADOSSTRIPER=OFF This commit conditionalizes inclusion of the libradosstriper header files and moves the "option(WITH_LIBRADOSSTRIPER..)" directive to before "add_subdirectory(include)", as we check for this variable in src/include. Fixes: http://tracker.ceph.com/issues/35922 Signed-off-by: Kefu Chai Signed-off-by: Nathan Cutler --- src/CMakeLists.txt | 3 ++- src/include/CMakeLists.txt | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7380a92906afa..3d638fc384664 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -438,10 +438,11 @@ add_subdirectory(perfglue) add_library(rados_snap_set_diff_obj OBJECT librados/snap_set_diff.cc) +option(WITH_LIBRADOSSTRIPER "build with libradosstriper support" ON) + add_subdirectory(include) add_subdirectory(librados) -option(WITH_LIBRADOSSTRIPER "build with libradosstriper support" ON) if(WITH_LIBRADOSSTRIPER) add_subdirectory(libradosstriper) endif() diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt index 581b3ebe03ef4..b2eafc917a250 100644 --- a/src/include/CMakeLists.txt +++ b/src/include/CMakeLists.txt @@ -9,10 +9,12 @@ install(FILES rados/librados.h crc32c.h rados/objclass.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rados) -install(FILES - radosstriper/libradosstriper.h - radosstriper/libradosstriper.hpp - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/radosstriper) +if(WITH_LIBRADOSSTRIPER) + install(FILES + radosstriper/libradosstriper.h + radosstriper/libradosstriper.hpp + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/radosstriper) +endif() if(WITH_RBD) install(FILES -- 2.39.5