cmake: Building ceph-detect-init from source code

Signed-off-by: Ali Maredia <amaredia@redhat.com>
This commit is contained in:
Ali Maredia 2016-02-14 23:22:02 -05:00
parent 4fc06be28b
commit b4de745091
3 changed files with 11 additions and 2 deletions

View File

@ -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

View File

@ -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")

View File

@ -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}