From ffab79587d736f3f9ff9a562db78a04b6c1d0cbe Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 16 Apr 2018 15:20:32 +0200 Subject: [PATCH] cmake/mgr: use Python 3 virtualenv if mgr subinterpreter is Python 3 Signed-off-by: Nathan Cutler --- src/pybind/mgr/dashboard/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/CMakeLists.txt b/src/pybind/mgr/dashboard/CMakeLists.txt index 5bdc8a3ed9358..83c3d6d3a7fea 100644 --- a/src/pybind/mgr/dashboard/CMakeLists.txt +++ b/src/pybind/mgr/dashboard/CMakeLists.txt @@ -2,7 +2,7 @@ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv) add_custom_target(mgr-dashboard-test-venv COMMAND - ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${MGR_DASHBOARD_VIRTUALENV} + ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${MGR_DASHBOARD_VIRTUALENV} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard COMMENT "dashboard tests virtualenv is being created") add_dependencies(tests mgr-dashboard-test-venv) @@ -13,7 +13,7 @@ set(mgr-dashboard-nodeenv ${CMAKE_CURRENT_BINARY_DIR}/node-env) add_custom_command( OUTPUT "${mgr-dashboard-nodeenv}/bin/npm" - COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=python2.7 ${mgr-dashboard-nodeenv} + COMMAND ${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh --python=${MGR_PYTHON_EXECUTABLE} ${mgr-dashboard-nodeenv} COMMAND ${mgr-dashboard-nodeenv}/bin/pip install nodeenv COMMAND ${mgr-dashboard-nodeenv}/bin/nodeenv -p -n 8.10.0 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- 2.39.5