Skip to content

Avoid duplicate python install #432

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

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

Avoid duplicate python install #432

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion cmake/spheral/SpheralAddLibs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ function(spheral_add_pybind11_library package_name module_list_name)
${CMAKE_BINARY_DIR}/.venv/${SPHERAL_SITE_PACKAGES_PATH}/Spheral/${MODULE_NAME}.so)

install(TARGETS ${MODULE_NAME}
DESTINATION ${SPHERAL_SITE_PACKAGES_PATH}/Spheral)
DESTINATION .venv/${SPHERAL_SITE_PACKAGES_PATH}/Spheral)

set_property(GLOBAL APPEND PROPERTY ${module_list_name} ${package_name})

Expand Down
7 changes: 2 additions & 5 deletions cmake/spheral/SpheralInstallPythonFiles.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,13 @@ function(spheral_install_python_files)

if (SPHERAL_ENABLE_PYTHON)
install(FILES ${ARGV}
DESTINATION ${SPHERAL_SITE_PACKAGES_PATH}/Spheral)
install(CODE "execute_process( \
COMMAND ${PYTHON_EXE} -m compileall ${SPHERAL_SITE_PACKAGES_PATH}/Spheral \
WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})")
DESTINATION .venv/${SPHERAL_SITE_PACKAGES_PATH}/Spheral)
endif()

endfunction()

#----------------------------------------------------------------------------------------
# spheral_instalL_python_tests
# spheral_install_python_tests
#----------------------------------------------------------------------------------------
# ----------------------
# INPUT VARIABLES
Expand Down
5 changes: 0 additions & 5 deletions src/Distributed/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,6 @@ if (SPHERAL_ENABLE_PYTHON)
configure_file(${MPIPY_FILE_NAME}
${CMAKE_BINARY_DIR}/.venv/${SPHERAL_SITE_PACKAGES_PATH}/Spheral/mpi.py
COPYONLY)

install(FILES ${MPIPY_FILE_NAME}
DESTINATION ${SPHERAL_SITE_PACKAGES_PATH}/Spheral
RENAME mpi.py
)
endif()
instantiate(Distributed_inst Distributed_sources)

Expand Down