From: Kefu Chai Date: Wed, 13 Jul 2016 16:52:17 +0000 (+0800) Subject: Merge pull request #10161 from ceph/wip-dang-cmake X-Git-Tag: ses5-milestone5~412 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8c5cf08898904cb6f4dd3debfae4556fe9f4589;p=ceph.git Merge pull request #10161 from ceph/wip-dang-cmake CMake - stop pip checking for updates Reviewed-by: Loic Dachary Reviewed-by: Ali Maredia Reviewed-by: Kefu Chai --- b8c5cf08898904cb6f4dd3debfae4556fe9f4589 diff --cc src/ceph-detect-init/CMakeLists.txt index d7e0f5b7b830,952eb3aeae2c..a3a94c888879 --- a/src/ceph-detect-init/CMakeLists.txt +++ b/src/ceph-detect-init/CMakeLists.txt @@@ -1,9 -1,9 +1,9 @@@ 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 . + ${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --disable-pip-version-check --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 --cc src/ceph-disk/CMakeLists.txt index c57ef446cf1f,5eae06ed765d..5db62337eaa7 --- a/src/ceph-disk/CMakeLists.txt +++ b/src/ceph-disk/CMakeLists.txt @@@ -1,9 -1,9 +1,9 @@@ 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 . + ${CEPH_DISK_VIRTUALENV}/bin/pip install --disable-pip-version-check --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")