Skip to content

[Draft] feat cmake: Preliminary support for Windows venvs #1002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

[Draft] feat cmake: Preliminary support for Windows venvs #1002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions cmake/UserverVenv.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ function(userver_venv_setup)
endif()

set(venv_dir "${parent_directory}/${venv_name}")
set(venv_bin_dir "${venv_dir}/bin")
if(WIN32)
set(venv_bin_dir "${venv_dir}/Scripts")
else()
set(venv_bin_dir "${venv_dir}/bin")
endif()
set("${python_output_var}"
"${venv_bin_dir}/python"
PARENT_SCOPE
Expand Down Expand Up @@ -146,15 +150,20 @@ function(userver_venv_setup)
message(STATUS " ${requirement}")
endforeach()
list(TRANSFORM ARG_REQUIREMENTS PREPEND "--requirement=" OUTPUT_VARIABLE pip_requirements)
if(WIN32)
set(venv_python python)
else()
set(venv_python python3)
endif()
Comment on lines +153 to +157
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably use python everywhere. See old line 97, we already return python in this path


# psycopg2 implicitly requires 'wheel' to be already installed
execute_process(COMMAND "${venv_bin_dir}/python3" -m pip install -U wheel RESULT_VARIABLE status)
execute_process(COMMAND "${venv_bin_dir}/${venv_python}" -m pip install -U wheel RESULT_VARIABLE status)
if(status)
message(FATAL_ERROR "Failed to install venv requirements")
endif()

execute_process(
COMMAND "${venv_bin_dir}/python3" -m pip install --disable-pip-version-check -U ${pip_requirements}
COMMAND "${venv_bin_dir}/${venv_python}" -m pip install --disable-pip-version-check -U ${pip_requirements}
${ARG_PIP_ARGS} RESULT_VARIABLE status
)
if(status)
Expand Down
Loading