From 1342ea80d56a06756cd7099a4f495b4c53dedd71 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 28 Apr 2016 16:58:15 -0400 Subject: [PATCH] cmake: put virtualenv directories under TMPDIR this was required for cmake-check to find ceph-disk and ceph-detect-init in the PATH Signed-off-by: Casey Bodley --- src/CMakeLists.txt | 6 ++++++ src/ceph-detect-init/CMakeLists.txt | 2 +- src/ceph-disk/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6e823a781ed..9f9014694a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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) diff --git a/src/ceph-detect-init/CMakeLists.txt b/src/ceph-detect-init/CMakeLists.txt index 53b4d4cb8b8..8cefcb16c24 100644 --- a/src/ceph-detect-init/CMakeLists.txt +++ b/src/ceph-detect-init/CMakeLists.txt @@ -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 diff --git a/src/ceph-disk/CMakeLists.txt b/src/ceph-disk/CMakeLists.txt index 5ee8778e7f2..025f6dbe3ec 100644 --- a/src/ceph-disk/CMakeLists.txt +++ b/src/ceph-disk/CMakeLists.txt @@ -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 -- 2.39.5