|
 |
f81482 |
From 680066203eb1e4c7334d4ce84e4b42e97d990ad6 Mon Sep 17 00:00:00 2001
|
|
|
f81482 |
From: Boris Ranto <branto@redhat.com>
|
|
|
f81482 |
Date: Wed, 30 May 2018 08:58:47 +0200
|
|
|
f81482 |
Subject: [PATCH] Strip away python2
|
|
|
f81482 |
|
|
|
f81482 |
---
|
|
|
f81482 |
src/CMakeLists.txt | 4 ----
|
|
|
f81482 |
src/pybind/CMakeLists.txt | 3 +--
|
|
|
f81482 |
2 files changed, 1 insertion(+), 6 deletions(-)
|
|
|
f81482 |
|
|
|
f81482 |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
|
f81482 |
index 2b59424f74..788e29c8a2 100644
|
|
|
f81482 |
--- a/src/CMakeLists.txt
|
|
|
f81482 |
+++ b/src/CMakeLists.txt
|
|
|
f81482 |
@@ -243,10 +243,6 @@ if(WITH_CEPHFS_JAVA)
|
|
|
f81482 |
add_subdirectory(java)
|
|
|
f81482 |
endif()
|
|
|
f81482 |
|
|
|
f81482 |
-# Python stuff
|
|
|
f81482 |
-find_package(PythonInterp 2 REQUIRED)
|
|
|
f81482 |
-find_package(PythonLibs 2 REQUIRED)
|
|
|
f81482 |
-
|
|
|
f81482 |
option(WITH_PYTHON3 "build python3 bindings" "CHECK")
|
|
|
f81482 |
if(WITH_PYTHON3 MATCHES "check|CHECK")
|
|
|
f81482 |
find_package(Python3Interp 3 QUIET)
|
|
|
f81482 |
diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
|
|
|
f81482 |
index dbdb23f1c5..1a14df972e 100644
|
|
|
f81482 |
--- a/src/pybind/CMakeLists.txt
|
|
|
f81482 |
+++ b/src/pybind/CMakeLists.txt
|
|
|
f81482 |
@@ -6,7 +6,6 @@ set(CYTHON_MODULE_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules)
|
|
|
f81482 |
if(WITH_PYTHON3)
|
|
|
f81482 |
set(py_vers 3)
|
|
|
f81482 |
endif()
|
|
|
f81482 |
-list(APPEND py_vers 2)
|
|
|
f81482 |
|
|
|
f81482 |
foreach(python_version ${py_vers})
|
|
|
f81482 |
if(${python_version} EQUAL 2)
|
|
|
f81482 |
@@ -58,7 +57,7 @@ endforeach()
|
|
|
f81482 |
|
|
|
f81482 |
install(FILES
|
|
|
f81482 |
${CMAKE_CURRENT_SOURCE_DIR}/ceph_rest_api.py
|
|
|
f81482 |
- DESTINATION ${PYTHON_INSTDIR})
|
|
|
f81482 |
+ DESTINATION ${PYTHON${PYTHON_VERSION}_INSTDIR})
|
|
|
f81482 |
|
|
|
f81482 |
if(WITH_MGR)
|
|
|
f81482 |
# Location needs to match default setting for mgr_module_path, currently:
|
|
|
f81482 |
--
|
|
|
f81482 |
2.14.3
|
|
|
f81482 |
|