]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cmake: put virtualenv directories under TMPDIR
authorCasey Bodley <cbodley@redhat.com>
Thu, 28 Apr 2016 20:58:15 +0000 (16:58 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 29 Apr 2016 16:23:35 +0000 (12:23 -0400)
this was required for cmake-check to find ceph-disk and ceph-detect-init
in the PATH

Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/CMakeLists.txt
src/ceph-detect-init/CMakeLists.txt
src/ceph-disk/CMakeLists.txt

index 6e823a781ed285efa007c45a94c0d454bcc3edcb..9f9014694a3329148dc73ee256dc5af741cc82aa 100644 (file)
@@ -524,6 +524,12 @@ install(TARGETS rados librados-config DESTINATION bin)
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/
   DESTINATION ${PYTHON_INSTDIR})
 
+# virtualenv base directory for ceph-disk and ceph-detect-init
+set(CEPH_BUILD_VIRTUALENV $ENV{TMPDIR})
+if(NOT CEPH_BUILD_VIRTUALENV)
+  set(CEPH_BUILD_VIRTUALENV /tmp)
+endif()
+
 add_subdirectory(pybind)
 add_subdirectory(ceph-disk)
 add_subdirectory(ceph-detect-init)
index 53b4d4cb8b840818970fe7d64eee4d36bc04f739..8cefcb16c247a3ddc38eccdcfa48bbb170c2c28e 100644 (file)
@@ -1,4 +1,4 @@
-set(CEPH_DETECT_INIT_VIRTUALENV ${CMAKE_BINARY_DIR}/ceph-detect-init-virtualenv)
+set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv)
 
 add_custom_target(ceph-detect-init
   COMMAND
index 5ee8778e7f25c5d6e80bf1f10971429930cac4b4..025f6dbe3ec0eab6d3b699ce2a033ed1926ad0d4 100644 (file)
@@ -1,4 +1,4 @@
-set(CEPH_DISK_VIRTUALENV ${CMAKE_BINARY_DIR}/ceph-disk-virtualenv)
+set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
 
 add_custom_target(ceph-disk
   COMMAND