cmake: Building ceph-disk from source code

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b227e8d8be20e3c1c6bc94bc1d63678a4df576a9..b484dbf54a0ac54d4707d863d6647be2c5d17f24 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -525,6 +525,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/
   DESTINATION ${PYTHON_INSTDIR})
 
 add_subdirectory(pybind)
+add_subdirectory(ceph-disk)
 
 ## dencoder
 set(dencoder_srcs

diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt
new file mode 100644 (file)
index 0000000..a298bb1
--- /dev/null
+++ b/src/ceph-disk/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_custom_target(ceph-disk
+  COMMAND
+  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${CMAKE_BINARY_DIR}/ceph-disk-virtualenv &&
+  virtualenv/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
+  COMMENT "ceph-disk is being created")

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 37535bf46cb22b8d5a746e83fc48135d8d1406b2..8c2995734bbfc5437ae448841077ca4e948b31ba 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -473,7 +473,8 @@ add_dependencies(check
   cls_lock
   ceph_test_objectstore
   ceph_erasure_code_non_regression
-  ceph_erasure_code)
+  ceph_erasure_code
+  ceph-disk)
 
 add_ceph_test(test-ceph-helpers.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-ceph-helpers.sh)
 add_ceph_test(erasure-decode-non-regression.sh ${CMAKE_SOURCE_DIR}/qa/workunits/erasure-code/encode-decode-non-regression.sh)
@@ -495,6 +496,17 @@ add_dependencies(check run-tox-ceph-disk)
 add_test(NAME run-tox-ceph-detect-init COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-detect-init/run-tox.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src)
 add_dependencies(check run-tox-ceph-disk)
 
+set_property(TEST 
+  run-tox-ceph-disk
+  PROPERTY ENVIRONMENT 
+  CEPH_ROOT=${CMAKE_SOURCE_DIR}
+  CEPH_BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+  CEPH_LIB=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+  LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
+  PATH=$ENV{PATH}:${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src
+  PYTHONPATH=${CMAKE_SOURCE_DIR}/src/pybind
+  )
+
 # unittest_admin_socket
 add_executable(unittest_admin_socket EXCLUDE_FROM_ALL
   admin_socket.cc