diff options
| author | Kefu Chai <kchai@redhat.com> | 2019-12-18 10:08:21 +0100 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2019-12-19 03:58:58 +0100 |
| commit | 5fc657b40dc7d27e84d4b62b5f37d9c771d74fcd (patch) | |
| tree | c5032c47424813c91b1114259b45fec1cc0b750f /run-make-check.sh | |
| parent | cmake: CMAKE_ROLE defaults to "PROJECT" (diff) | |
| download | ceph-5fc657b40dc7d27e84d4b62b5f37d9c771d74fcd.tar.xz ceph-5fc657b40dc7d27e84d4b62b5f37d9c771d74fcd.zip | |
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 <kchai@redhat.com>
Diffstat (limited to 'run-make-check.sh')
| -rwxr-xr-x | run-make-check.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/run-make-check.sh b/run-make-check.sh index 2763af04569..4a022fec982 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -54,7 +54,7 @@ function main() { fi FOR_MAKE_CHECK=1 prepare # Init defaults after deps are installed. - configure "-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON -DWITH_CEPHFS_SHELL=ON -DWITH_SPDK=ON -DENABLE_GIT_VERSION=OFF $@" + configure " -DWITH_PYTHON3=3 -DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON -DWITH_CEPHFS_SHELL=ON -DWITH_SPDK=ON -DENABLE_GIT_VERSION=OFF $@" build tests && echo "make check: successful run on $(git rev-parse HEAD)" run } |