cmake: Building ceph-detect-init from source code

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b484dbf54a0ac54d4707d863d6647be2c5d17f24..50de7a6cad1175340fef6ed64658bc23e5181f36 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -526,6 +526,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/
 
 add_subdirectory(pybind)
 add_subdirectory(ceph-disk)
+add_subdirectory(ceph-detect-init)
 
 ## dencoder
 set(dencoder_srcs

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

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 8c2995734bbfc5437ae448841077ca4e948b31ba..df9f9555346dd7f08c5f4f597327d47e082e3936 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -474,7 +474,8 @@ add_dependencies(check
   ceph_test_objectstore
   ceph_erasure_code_non_regression
   ceph_erasure_code
-  ceph-disk)
+  ceph-disk
+  ceph-detect-init)
 
 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)
@@ -494,10 +495,11 @@ add_test(NAME run-tox-ceph-disk COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-disk/r
 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)
+add_dependencies(check run-tox-ceph-detect-init)
 
 set_property(TEST 
   run-tox-ceph-disk
+  run-tox-ceph-detect-init
   PROPERTY ENVIRONMENT 
   CEPH_ROOT=${CMAKE_SOURCE_DIR}
   CEPH_BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}