From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 11 Sep 2018 11:56:25 +0000 (+0200)
Subject: cmake: no libradosstriper headers if WITH_LIBRADOSSTRIPER=OFF
X-Git-Tag: v14.0.1~287^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F24029%2Fhead;p=ceph.git

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 <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7380a92906a..3d638fc3846 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 581b3ebe03e..b2eafc917a2 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