From: Ali Maredia <amaredia@redhat.com>
Date: Mon, 15 Feb 2016 04:22:02 +0000 (-0500)
Subject: cmake: Building ceph-detect-init from source code
X-Git-Tag: v10.2.0~27^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b4de745091755ed65251d2a340d46fb086131032;p=ceph.git

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 b484dbf54a0a..50de7a6cad11 100644
--- 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
index 000000000000..1fb2440cb516
--- /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 8c2995734bbf..df9f9555346d 100644
--- 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}