From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 30 May 2018 16:18:45 +0000 (-0400)
Subject: cmake: remove top-level entries for ceph-disk, ceph-detect-init
X-Git-Tag: v14.0.1~1088^2~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d0f6e5fc2da018b7845f62296c479c65f75774c;p=ceph.git

cmake: remove top-level entries for ceph-disk, ceph-detect-init

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b372759b775..c54df0f9f75 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -794,16 +794,8 @@ target_link_libraries(librados-config librados global ${BLKID_LIBRARIES} ${RDMA_
 
 install(TARGETS librados-config DESTINATION bin)
 
-# 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-volume)
-add_subdirectory(ceph-detect-init)
 
 ## dencoder
 if(HAS_VTA)
@@ -988,7 +980,6 @@ install(PROGRAMS
 
 install(PROGRAMS
   ${CMAKE_SOURCE_DIR}/src/ceph-create-keys
-#  ${CMAKE_SOURCE_DIR}/src/ceph-disk
   DESTINATION sbin)
 
 add_subdirectory(bash_completion)