From 5fc657b40dc7d27e84d4b62b5f37d9c771d74fcd Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 18 Dec 2019 17:08:21 +0800 Subject: cmake: drop WITH_PYTHON2 option * drop WITH_PYTHON2 option * print warning message if WITH_PYTHON3 is disabled * drop MGR_PYTHON_VERSION option, as we don't support use different python version for python binding and ceph-mgr embedded python interpreter anymore. as before switching to python3-only build, we can build python3 and python2 python bindings, and ceph-mgr can use either of them. but after switching to python3-only build, ceph-mgr has to use whatever python version used to build python binding. * move WITH_PYTHON3 option to $top_srcdir/CMakeLists.txt, as ceph-mgr and python binding will share this option. * hardware ${PYTHON_VERSION} to 3 * hardware ${Python${PYTHON_VERSION}_VERSION_MAJOR} to 3 * only build boost library with python3 * s/Python_EXECUTABLE/Python3_EXECUTABLE/ * update the build scripts and packagings accordingly * rename all cython${PYTHON_VERSION}_* targets to cython_* * update distutils_install_module() so it does not take python_version parameter anymore. Signed-off-by: Kefu Chai --- do_cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'do_cmake.sh') diff --git a/do_cmake.sh b/do_cmake.sh index 2f6e5bbb82e..12ab5377f87 100755 --- a/do_cmake.sh +++ b/do_cmake.sh @@ -42,7 +42,7 @@ else fi if [[ "$PYBUILD" =~ ^3(\..*)?$ ]] ; then - ARGS+=" -DWITH_PYTHON2=OFF -DWITH_PYTHON3=${PYBUILD} -DMGR_PYTHON_VERSION=${PYBUILD}" + ARGS+=" -DWITH_PYTHON3=${PYBUILD}" fi if type ccache > /dev/null 2>&1 ; then -- cgit v1.2.3