Skip to content

Don't use find_package to lookup newly created virtual env #104

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

Merged
wdeconinck merged 1 commit into from
Jul 31, 2026
Merged

Don't use find_package to lookup newly created virtual env #104

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
29 changes: 7 additions & 22 deletions cmake/fckit_install_venv.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,13 @@ macro( fckit_install_venv )
VENV_ACTIVATE_CONTENT "${VENV_ACTIVATE_CONTENT}")
file(WRITE ${VENV_PATH}/bin/activate ${VENV_ACTIVATE_CONTENT} )

# Change the context of the search to only find the venv
set( Python3_FIND_VIRTUALENV ONLY )
set( Python3_EXECUTABLE_CACHE ${Python3_EXECUTABLE} )
set( FCKIT_VENV_PYTHON_EXECUTABLE "${VENV_PATH}/bin/python3" )

# Unset Python3_EXECUTABLE because it is also an input variable
# (see documentation, Artifacts Specification section)
unset( Python3_EXECUTABLE )
# To allow cmake to discover the newly created venv if Python3_ROOT_DIR
# was passed as an argument at build-time
set( Python3_ROOT_DIR "${VENV_PATH}" )

# Find newly created python venv
find_package( Python3 COMPONENTS Interpreter REQUIRED )

# Make sure the Python installation has (sufficiently recent) pip
execute_process( COMMAND ${Python3_EXECUTABLE} -m ensurepip -U OUTPUT_QUIET )
Comment thread
wdeconinck marked this conversation as resolved.
# Make sure the venv has (sufficiently recent) pip
execute_process( COMMAND ${FCKIT_VENV_PYTHON_EXECUTABLE} -m ensurepip -U OUTPUT_QUIET )

if( Python3_VERSION VERSION_EQUAL 3.8 )
execute_process( COMMAND ${Python3_EXECUTABLE} -m pip --disable-pip-version-check
execute_process( COMMAND ${FCKIT_VENV_PYTHON_EXECUTABLE} -m pip --disable-pip-version-check
install --upgrade pip OUTPUT_QUIET ERROR_QUIET )
endif()
Comment thread
wdeconinck marked this conversation as resolved.

Expand Down Expand Up @@ -71,7 +59,7 @@ macro( fckit_install_venv )
PATTERN "dist" EXCLUDE
PATTERN "__pycache__" EXCLUDE )

execute_process( COMMAND ${Python3_EXECUTABLE} -m pip
execute_process( COMMAND ${FCKIT_VENV_PYTHON_EXECUTABLE} -m pip
install ${PIP_OPTIONS} "${_pkg_bld}"
RESULT_VARIABLE _pip_result
OUTPUT_QUIET )
Expand All @@ -96,14 +84,11 @@ macro( fckit_install_venv )
endif()

# add python interpreter of venv as executable target
set( FCKIT_VENV_EXE ${Python3_EXECUTABLE} )
set( FCKIT_VENV_EXE ${FCKIT_VENV_PYTHON_EXECUTABLE} )

# compute relative path to venv to aid with installation
string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" rel_venv_exe_path ${FCKIT_VENV_EXE})

set( FYPP ${CMAKE_CURRENT_SOURCE_DIR}/tools/fckit-eval.sh ${FCKIT_VENV_EXE} -m fypp )

# reset Python3_EXECUTABLE to the system install
set( Python3_EXECUTABLE ${Python3_EXECUTABLE_CACHE} )

endmacro()
endmacro()
Loading