Skip to content
Snippets Groups Projects
Commit e29d5bd5 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by GitHub
Browse files

Merge pull request #284 from chuckatkins/fix-python-module-path

Fix python module path
parents 742ae731 5fa49b2f
No related branches found
No related tags found
No related merge requests found
......@@ -177,6 +177,14 @@ if(ADIOS2_HAVE_Fortran)
message("")
endif()
message(" Installation prefix: ${CMAKE_INSTALL_PREFIX}")
message(" bin: ${CMAKE_INSTALL_BINDIR}")
message(" lib: ${CMAKE_INSTALL_LIBDIR}")
message(" include: ${CMAKE_INSTALL_INCLUDEDIR}")
message(" cmake: ${CMAKE_INSTALL_CMAKEDIR}")
if(ADIOS2_HAVE_Python)
message(" python: ${CMAKE_INSTALL_PYTHONDIR}")
endif()
message("")
message(" Features:")
if(BUILD_SHARED_LIBS)
set(msg_lib_type "shared")
......
......@@ -18,9 +18,8 @@ if(ADIOS2_HAVE_MPI)
target_link_libraries(adios2py PRIVATE PythonModule::mpi4py)
endif()
string(REGEX REPLACE
"^${PYTHON_PREFIX}/[^/]*/python" "${CMAKE_INSTALL_LIBDIR}/python"
CMAKE_INSTALL_PYTHONDIR "${PYTHON_SITE_PACKAGES}"
set(CMAKE_INSTALL_PYTHONDIR
"${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages"
)
set(CMAKE_INSTALL_PYTHONDIR "${CMAKE_INSTALL_PYTHONDIR}"
CACHE INTERNAL "" FORCE
......@@ -30,6 +29,6 @@ set_target_properties(adios2py PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}
RUNTIME_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_PYTHONDIR}
)
install(TARGETS adios2py
install(TARGETS adios2py
DESTINATION ${CMAKE_INSTALL_PYTHONDIR}
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment