From e9ce7f0daefc143cfbba4c767bcc1a93757dccd3 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 6 Jul 2016 23:47:47 +0800 Subject: [PATCH] Revert "cmake: add ceph-{disk,detect-init} to ALL" This reverts commit 19c0731751df9642cc5b8c583ea41d12e0b5ec41. Signed-off-by: Kefu Chai --- src/ceph-detect-init/CMakeLists.txt | 2 +- src/ceph-disk/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt index fbcf90dac2418c..d7e0f5b7b83086 100644 --- a/src/ceph-detect-init/CMakeLists.txt +++ b/src/ceph-detect-init/CMakeLists.txt @@ -1,6 +1,6 @@ set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv) -add_custom_target(ceph-detect-init ALL +add_custom_target(ceph-detect-init COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} && ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e . diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt index de767e4b8bb2c7..c57ef446cf1f12 100644 --- a/src/ceph-disk/CMakeLists.txt +++ b/src/ceph-disk/CMakeLists.txt @@ -1,6 +1,6 @@ set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv) -add_custom_target(ceph-disk ALL +add_custom_target(ceph-disk COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} && ${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .