From 17302784bd61123016fe5ff31220375e8b77ffcc Mon Sep 17 00:00:00 2001 From: Landon Owen Date: Mon, 17 Nov 2025 16:54:17 -0800 Subject: [PATCH] Only install python stuff once --- cmake/spheral/SpheralAddLibs.cmake | 2 +- cmake/spheral/SpheralInstallPythonFiles.cmake | 7 ++----- src/Distributed/CMakeLists.txt | 5 ----- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/cmake/spheral/SpheralAddLibs.cmake b/cmake/spheral/SpheralAddLibs.cmake index 8b2c57e32..08da4b491 100644 --- a/cmake/spheral/SpheralAddLibs.cmake +++ b/cmake/spheral/SpheralAddLibs.cmake @@ -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}) diff --git a/cmake/spheral/SpheralInstallPythonFiles.cmake b/cmake/spheral/SpheralInstallPythonFiles.cmake index 171c3cd6d..82e4c6778 100644 --- a/cmake/spheral/SpheralInstallPythonFiles.cmake +++ b/cmake/spheral/SpheralInstallPythonFiles.cmake @@ -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 diff --git a/src/Distributed/CMakeLists.txt b/src/Distributed/CMakeLists.txt index c20cd5ddb..3f4ec8b4a 100644 --- a/src/Distributed/CMakeLists.txt +++ b/src/Distributed/CMakeLists.txt @@ -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)