]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: Added CMAKE_CEPH_*_VIRTUALENV var to fix build 8658/head
authorAli Maredia <amaredia@redhat.com>
Tue, 19 Apr 2016 19:30:59 +0000 (15:30 -0400)
committerAli Maredia <amaredia@redhat.com>
Tue, 19 Apr 2016 20:37:45 +0000 (16:37 -0400)
Signed-off-by: Ali Maredia <amaredia@redhat.com>
src/ceph-detect-init/CMakeLists.txt
src/ceph-disk/CMakeLists.txt

index 1fb2440cb516f229b7f0e9fce7889ec3d15a85ce..53b4d4cb8b840818970fe7d64eee4d36bc04f739 100644 (file)
@@ -1,6 +1,8 @@
+set(CEPH_DETECT_INIT_VIRTUALENV ${CMAKE_BINARY_DIR}/ceph-detect-init-virtualenv)
+
 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 .
+  ${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 .
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-detect-init
   COMMENT "ceph-detect-init is being created")
index a298bb1a7cbc628b64114849ac395adeb65231f2..5ee8778e7f25c5d6e80bf1f10971429930cac4b4 100644 (file)
@@ -1,6 +1,8 @@
+set(CEPH_DISK_VIRTUALENV ${CMAKE_BINARY_DIR}/ceph-disk-virtualenv)
+
 add_custom_target(ceph-disk
   COMMAND
-  ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${CMAKE_BINARY_DIR}/ceph-disk-virtualenv &&
-  virtualenv/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .
+  ${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 .
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/ceph-disk
   COMMENT "ceph-disk is being created")